commit 14d80793a891a088d5221b78f07c950d0adb1d90
author jiayl@webrtc.org <jiayl@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Feb 12 00:41:59 2014 +0000
committer jiayl@webrtc.org <jiayl@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Feb 12 00:41:59 2014 +0000
tree 84b3f77406cedac87796ba6da1001d1c93079f4a
parent b659e2844dcf65286ac44d41ce48e9b105a6e978

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

diff --git a/talk/examples/peerconnection/client/linux/main.cc b/talk/examples/peerconnection/client/linux/main.cc
index aee1bb1..4ef81cd 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 @@
   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> conductor(
@@ -111,7 +113,7 @@
   //while (gtk_events_pending()) {
   //  gtk_main_iteration();
   //}
-
+  talk_base::CleanupSSL();
   return 0;
 }
 

talk/examples/peerconnection/client/main.cc

diff --git a/talk/examples/peerconnection/client/main.cc b/talk/examples/peerconnection/client/main.cc
index bd0a5c3..e68c78e 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 @@
     return -1;
   }
 
+  talk_base::InitializeSSL();
   PeerConnectionClient client;
   talk_base::scoped_refptr<Conductor> conductor(
         new talk_base::RefCountedObject<Conductor>(&client, &wnd));
@@ -68,5 +70,6 @@
     }
   }
 
+  talk_base::CleanupSSL();
   return 0;
 }