| Index: content/renderer/p2p/ipc_socket_factory.cc
|
| ===================================================================
|
| --- content/renderer/p2p/ipc_socket_factory.cc (revision 217133)
|
| +++ content/renderer/p2p/ipc_socket_factory.cc (working copy)
|
| @@ -23,7 +23,9 @@
|
| return (type == P2P_SOCKET_STUN_TCP_CLIENT) ||
|
| (type == P2P_SOCKET_TCP_CLIENT) ||
|
| (type == P2P_SOCKET_STUN_SSLTCP_CLIENT) ||
|
| - (type == P2P_SOCKET_SSLTCP_CLIENT);
|
| + (type == P2P_SOCKET_SSLTCP_CLIENT) ||
|
| + (type == P2P_SOCKET_TLS_CLIENT) ||
|
| + (type == P2P_SOCKET_STUN_TLS_CLIENT);
|
| }
|
|
|
| // TODO(miu): This needs tuning. http://crbug.com/237960
|
| @@ -433,6 +435,9 @@
|
| if (opts & talk_base::PacketSocketFactory::OPT_SSLTCP) {
|
| type = (opts & talk_base::PacketSocketFactory::OPT_STUN) ?
|
| P2P_SOCKET_STUN_SSLTCP_CLIENT : P2P_SOCKET_SSLTCP_CLIENT;
|
| + } else if (opts & talk_base::PacketSocketFactory::OPT_TLS) {
|
| + type = (opts & talk_base::PacketSocketFactory::OPT_STUN) ?
|
| + P2P_SOCKET_STUN_TLS_CLIENT : P2P_SOCKET_TLS_CLIENT;
|
| } else {
|
| type = (opts & talk_base::PacketSocketFactory::OPT_STUN) ?
|
| P2P_SOCKET_STUN_TCP_CLIENT : P2P_SOCKET_TCP_CLIENT;
|
|
|