diff options
author | sergeyu <sergeyu@chromium.org> | 2014-09-11 14:45:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-11 22:01:29 +0000 |
commit | 28d886c967e016a5d5812be43cd5916f577c2e10 (patch) | |
tree | 4510350de11125ab89cfcf60ae8a624a8659037b /remoting/protocol/protobuf_video_writer.h | |
parent | 042e7e077ee2cb726804c27313093241b97bf09e (diff) | |
download | chromium_src-28d886c967e016a5d5812be43cd5916f577c2e10.zip chromium_src-28d886c967e016a5d5812be43cd5916f577c2e10.tar.gz chromium_src-28d886c967e016a5d5812be43cd5916f577c2e10.tar.bz2 |
Move PseudoTCP and channel auth out of LibjingleTransportFactory.
Previously TransportFactory interface was responsible for creation
and initialization of several protocol layers, including PseudoTCP and
authentication (TLS). Simplified it so now it only creates raw datagram
transport channel. PseudoTcpChannelFactory is now responsible for
setting up PseudoTcpAdapter and AuthenticatingChannelFactory takes care
of channel authentication. Also added DatagramChannelFactory for
Datagram channels.
This change will make it possible to replace PseudoTcpChannelFactory
with an object that creates SCTP-based channels.
Also fixed a bug in SslHmacChannelAuthenticator. It wasn't working
properly when deleted from the callback. (base::Callback objects
shouldn't be deleted while being called because when deleted they
also destroy reference parameters values they are holding).
BUG=402993
Review URL: https://codereview.chromium.org/551173004
Cr-Commit-Position: refs/heads/master@{#294474}
Diffstat (limited to 'remoting/protocol/protobuf_video_writer.h')
-rw-r--r-- | remoting/protocol/protobuf_video_writer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/protocol/protobuf_video_writer.h b/remoting/protocol/protobuf_video_writer.h index 961e821..b139e15 100644 --- a/remoting/protocol/protobuf_video_writer.h +++ b/remoting/protocol/protobuf_video_writer.h @@ -20,7 +20,7 @@ class StreamSocket; namespace remoting { namespace protocol { -class ChannelFactory; +class StreamChannelFactory; class Session; class ProtobufVideoWriter : public VideoWriter { @@ -43,7 +43,7 @@ class ProtobufVideoWriter : public VideoWriter { InitializedCallback initialized_callback_; - ChannelFactory* channel_factory_; + StreamChannelFactory* channel_factory_; scoped_ptr<net::StreamSocket> channel_; BufferedSocketWriter buffered_writer_; |