From 14d80793a891a088d5221b78f07c950d0adb1d90 Mon Sep 17 00:00:00 2001 From: "jiayl@webrtc.org" Date: Wed, 12 Feb 2014 00:41:59 +0000 Subject: [PATCH] PeerConnectionClient needs to initialize SSL. BUG=2911 R=fischman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/8499004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5531 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/examples/peerconnection/client/linux/main.cc | 4 +++- talk/examples/peerconnection/client/main.cc | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/talk/examples/peerconnection/client/linux/main.cc b/talk/examples/peerconnection/client/linux/main.cc index aee1bb100d..4ef81cdac7 100644 --- a/talk/examples/peerconnection/client/linux/main.cc +++ b/talk/examples/peerconnection/client/linux/main.cc @@ -32,6 +32,7 @@ #include "talk/examples/peerconnection/client/linux/main_wnd.h" #include "talk/examples/peerconnection/client/peer_connection_client.h" +#include "talk/base/ssladapter.h" #include "talk/base/thread.h" class CustomSocketServer : public talk_base::PhysicalSocketServer { @@ -94,6 +95,7 @@ int main(int argc, char* argv[]) { CustomSocketServer socket_server(thread, &wnd); thread->set_socketserver(&socket_server); + talk_base::InitializeSSL(); // Must be constructed after we set the socketserver. PeerConnectionClient client; talk_base::scoped_refptr conductor( @@ -111,7 +113,7 @@ int main(int argc, char* argv[]) { //while (gtk_events_pending()) { // gtk_main_iteration(); //} - + talk_base::CleanupSSL(); return 0; } diff --git a/talk/examples/peerconnection/client/main.cc b/talk/examples/peerconnection/client/main.cc index bd0a5c3c17..e68c78ef87 100644 --- a/talk/examples/peerconnection/client/main.cc +++ b/talk/examples/peerconnection/client/main.cc @@ -28,6 +28,7 @@ #include "talk/examples/peerconnection/client/conductor.h" #include "talk/examples/peerconnection/client/main_wnd.h" #include "talk/examples/peerconnection/client/peer_connection_client.h" +#include "talk/base/ssladapter.h" #include "talk/base/win32socketinit.h" #include "talk/base/win32socketserver.h" @@ -44,6 +45,7 @@ int PASCAL wWinMain(HINSTANCE instance, HINSTANCE prev_instance, return -1; } + talk_base::InitializeSSL(); PeerConnectionClient client; talk_base::scoped_refptr conductor( new talk_base::RefCountedObject(&client, &wnd)); @@ -68,5 +70,6 @@ int PASCAL wWinMain(HINSTANCE instance, HINSTANCE prev_instance, } } + talk_base::CleanupSSL(); return 0; }