| Index: content/browser/renderer_host/p2p/socket_host_tcp_server.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/p2p/socket_host_tcp_server.cc (revision 205587)
|
| +++ content/browser/renderer_host/p2p/socket_host_tcp_server.cc (working copy)
|
| @@ -21,7 +21,7 @@
|
| namespace content {
|
|
|
| P2PSocketHostTcpServer::P2PSocketHostTcpServer(
|
| - IPC::Sender* message_sender, int id, P2PSocketType client_type)
|
| + IPC::Sender* message_sender, int id, P2PSocketType client_type, bool ssl)
|
| : P2PSocketHost(message_sender, id),
|
| client_type_(client_type),
|
| socket_(new net::TCPServerSocket(NULL, net::NetLog::Source())),
|
| @@ -131,9 +131,13 @@
|
|
|
| scoped_ptr<P2PSocketHostTcpBase> result;
|
| if (client_type_ == P2P_SOCKET_TCP_CLIENT) {
|
| - result.reset(new P2PSocketHostTcp(message_sender_, id));
|
| - } else {
|
| - result.reset(new P2PSocketHostStunTcp(message_sender_, id));
|
| + result.reset(new P2PSocketHostTcp(message_sender_, id, false));
|
| + } else if (client_type_ == P2P_SOCKET_STUN_TCP_CLIENT) {
|
| + result.reset(new P2PSocketHostStunTcp(message_sender_, id, false));
|
| + } else if (client_type_ == P2P_SOCKET_SSLTCP_CLIENT) {
|
| + result.reset(new P2PSocketHostTcp(message_sender_, id, true));
|
| + } else if (client_type_ == P2P_SOCKET_STUN_SSLTCP_CLIENT) {
|
| + result.reset(new P2PSocketHostStunTcp(message_sender_, id, true));
|
| }
|
| if (!result->InitAccepted(remote_address, socket))
|
| return NULL;
|
|
|