generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PeerConnectionClient needs to initialize SSL.

Browse Source 
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
This commit is contained in:
jiayl@webrtc.org 2014-02-12 00:41:59 +00:00
parent b659e2844d
commit 14d80793a8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/examples/peerconnection/client/linux/main.cc
View File

@ -32,6 +32,7 @@
#include "talk/examples/peerconnection/client/linux/main_wnd.h" #include "talk/examples/peerconnection/client/linux/main_wnd.h"
#include "talk/examples/peerconnection/client/peer_connection_client.h" #include "talk/examples/peerconnection/client/peer_connection_client.h"
#include "talk/base/ssladapter.h"
#include "talk/base/thread.h" #include "talk/base/thread.h"
class CustomSocketServer : public talk_base::PhysicalSocketServer { class CustomSocketServer : public talk_base::PhysicalSocketServer {
@ -94,6 +95,7 @@ int main(int argc, char* argv[]) {
CustomSocketServer socket_server(thread, &wnd); CustomSocketServer socket_server(thread, &wnd);
thread->set_socketserver(&socket_server); thread->set_socketserver(&socket_server);
talk_base::InitializeSSL();
// Must be constructed after we set the socketserver. // Must be constructed after we set the socketserver.
PeerConnectionClient client; PeerConnectionClient client;
talk_base::scoped_refptr<Conductor> conductor( talk_base::scoped_refptr<Conductor> conductor(
@ -111,7 +113,7 @@ int main(int argc, char* argv[]) {
//while (gtk_events_pending()) { //while (gtk_events_pending()) {
// gtk_main_iteration(); // gtk_main_iteration();
//} //}
talk_base::CleanupSSL();
return 0; return 0;
} }

3
talk/examples/peerconnection/client/main.cc
View File

@ -28,6 +28,7 @@
#include "talk/examples/peerconnection/client/conductor.h" #include "talk/examples/peerconnection/client/conductor.h"
#include "talk/examples/peerconnection/client/main_wnd.h" #include "talk/examples/peerconnection/client/main_wnd.h"
#include "talk/examples/peerconnection/client/peer_connection_client.h" #include "talk/examples/peerconnection/client/peer_connection_client.h"
#include "talk/base/ssladapter.h"
#include "talk/base/win32socketinit.h" #include "talk/base/win32socketinit.h"
#include "talk/base/win32socketserver.h" #include "talk/base/win32socketserver.h"
@ -44,6 +45,7 @@ int PASCAL wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
return -1; return -1;
} }
talk_base::InitializeSSL();
PeerConnectionClient client; PeerConnectionClient client;
talk_base::scoped_refptr<Conductor> conductor( talk_base::scoped_refptr<Conductor> conductor(
new talk_base::RefCountedObject<Conductor>(&client, &wnd)); new talk_base::RefCountedObject<Conductor>(&client, &wnd));
@ -68,5 +70,6 @@ int PASCAL wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
} }
} }
talk_base::CleanupSSL();
return 0; return 0;
} }