Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1871)

Unified Diff: content/renderer/p2p/ipc_socket_factory.cc

Issue 22452002: Adding TLS support to the TCP Client sockets. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/p2p/ipc_socket_factory.cc
===================================================================
--- content/renderer/p2p/ipc_socket_factory.cc (revision 216917)
+++ 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;

Powered by Google App Engine
This is Rietveld 408576698