From f7b87be65b81a9f85eb1871cd476ffead2aecb7e Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Tue, 9 Oct 2018 14:43:25 -0700 Subject: [PATCH] win tls wip --- ixwebsocket/IXSocket.cpp | 5 +++++ ixwebsocket/IXSocket.h | 2 ++ ixwebsocket/IXWebSocketTransport.cpp | 5 ++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ixwebsocket/IXSocket.cpp b/ixwebsocket/IXSocket.cpp index 5fbf1895..52a4ba8e 100644 --- a/ixwebsocket/IXSocket.cpp +++ b/ixwebsocket/IXSocket.cpp @@ -301,4 +301,9 @@ namespace ix WSACleanup(); #endif } + + void Socket::secureSocket() + { + ; + } } diff --git a/ixwebsocket/IXSocket.h b/ixwebsocket/IXSocket.h index adb812dc..bf3823e5 100644 --- a/ixwebsocket/IXSocket.h +++ b/ixwebsocket/IXSocket.h @@ -40,6 +40,8 @@ namespace ix virtual int send(const std::string& buffer); virtual int recv(void* buffer, size_t length); + virtual void secureSocket(); // Windows + int getErrno() const; static bool init(); // Required on Windows to initialize WinSocket static void cleanup(); // Required on Windows to cleanup WinSocket diff --git a/ixwebsocket/IXWebSocketTransport.cpp b/ixwebsocket/IXWebSocketTransport.cpp index 9f02fa90..df8373ac 100644 --- a/ixwebsocket/IXWebSocketTransport.cpp +++ b/ixwebsocket/IXWebSocketTransport.cpp @@ -14,12 +14,11 @@ #ifdef IXWEBSOCKET_USE_TLS # ifdef __APPLE__ # include "IXSocketAppleSSL.h" -# else +# elif defined(__linux__) # include "IXSocketOpenSSL.h" # endif #endif -// #include #include #include @@ -145,7 +144,7 @@ namespace ix { #ifdef IXWEBSOCKET_USE_TLS # ifdef __APPLE__ _socket = std::make_shared(); -# else +# elif defined(__linux__) _socket = std::make_shared(); # endif #else