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

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

Issue 16516003: SSLTCP (pseudo-SSL with fake handshake and unencrypted data) support for p2p socket. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 6 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
« no previous file with comments | « content/content_browser.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/p2p/ipc_socket_factory.cc
===================================================================
--- content/renderer/p2p/ipc_socket_factory.cc (revision 205587)
+++ content/renderer/p2p/ipc_socket_factory.cc (working copy)
@@ -419,12 +419,14 @@
const talk_base::SocketAddress& remote_address,
const talk_base::ProxyInfo& proxy_info,
const std::string& user_agent, int opts) {
- // TODO(sergeyu): Implement SSL support.
- if (opts & talk_base::PacketSocketFactory::OPT_SSLTCP)
- return NULL;
-
- P2PSocketType type = (opts & talk_base::PacketSocketFactory::OPT_STUN) ?
- P2P_SOCKET_STUN_TCP_CLIENT : P2P_SOCKET_TCP_CLIENT;
+ P2PSocketType type;
+ if (opts & talk_base::PacketSocketFactory::OPT_SSLTCP) {
+ type = (opts & talk_base::PacketSocketFactory::OPT_STUN) ?
+ P2P_SOCKET_STUN_SSLTCP_CLIENT : P2P_SOCKET_SSLTCP_CLIENT;
+ } else {
+ type = (opts & talk_base::PacketSocketFactory::OPT_STUN) ?
+ P2P_SOCKET_STUN_TCP_CLIENT : P2P_SOCKET_TCP_CLIENT;
+ }
P2PSocketClient* socket_client = new P2PSocketClient(socket_dispatcher_);
scoped_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
if (!socket->Init(type, socket_client, local_address,
« no previous file with comments | « content/content_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698