diff options
| author | sergeyu <sergeyu@chromium.org> | 2014-09-12 13:43:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-12 20:49:52 +0000 |
| commit | 9cb142f0cb33af89ff478e69e803fdf32f09006e (patch) | |
| tree | 20fdc88e708d5b247b6c6f84416c8a7fcabfdfdd /remoting/protocol/channel_dispatcher_base.cc | |
| parent | 02247c02b993b041e0da5a1f03e2f173ff81e888 (diff) | |
| download | chromium_src-9cb142f0cb33af89ff478e69e803fdf32f09006e.zip chromium_src-9cb142f0cb33af89ff478e69e803fdf32f09006e.tar.gz chromium_src-9cb142f0cb33af89ff478e69e803fdf32f09006e.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@{#294653}
Diffstat (limited to 'remoting/protocol/channel_dispatcher_base.cc')
| -rw-r--r-- | remoting/protocol/channel_dispatcher_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/protocol/channel_dispatcher_base.cc b/remoting/protocol/channel_dispatcher_base.cc index 10d64006..c292b2a 100644 --- a/remoting/protocol/channel_dispatcher_base.cc +++ b/remoting/protocol/channel_dispatcher_base.cc @@ -6,9 +6,9 @@ #include "base/bind.h" #include "net/socket/stream_socket.h" -#include "remoting/protocol/channel_factory.h" #include "remoting/protocol/session.h" #include "remoting/protocol/session_config.h" +#include "remoting/protocol/stream_channel_factory.h" namespace remoting { namespace protocol { |