kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win tls wip

Browse Source
This commit is contained in:
Benjamin Sergeant 2018-10-09 14:43:25 -07:00
parent 739a43988c
commit f7b87be65b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ixwebsocket/IXSocket.cpp
View File

@ -301,4 +301,9 @@ namespace ix
WSACleanup(); WSACleanup();
#endif #endif
} }
void Socket::secureSocket()
{
;
}
} }

2
ixwebsocket/IXSocket.h
View File

@ -40,6 +40,8 @@ namespace ix
virtual int send(const std::string& buffer); virtual int send(const std::string& buffer);
virtual int recv(void* buffer, size_t length); virtual int recv(void* buffer, size_t length);
virtual void secureSocket(); // Windows
int getErrno() const; int getErrno() const;
static bool init(); // Required on Windows to initialize WinSocket static bool init(); // Required on Windows to initialize WinSocket
static void cleanup(); // Required on Windows to cleanup WinSocket static void cleanup(); // Required on Windows to cleanup WinSocket

5
ixwebsocket/IXWebSocketTransport.cpp
View File

@ -14,12 +14,11 @@
#ifdef IXWEBSOCKET_USE_TLS #ifdef IXWEBSOCKET_USE_TLS
# ifdef __APPLE__ # ifdef __APPLE__
# include "IXSocketAppleSSL.h" # include "IXSocketAppleSSL.h"
# else # elif defined(__linux__)
# include "IXSocketOpenSSL.h" # include "IXSocketOpenSSL.h"
# endif # endif
#endif #endif
// #include <unistd.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -145,7 +144,7 @@ namespace ix {
#ifdef IXWEBSOCKET_USE_TLS #ifdef IXWEBSOCKET_USE_TLS
# ifdef __APPLE__ # ifdef __APPLE__
_socket = std::make_shared<SocketAppleSSL>(); _socket = std::make_shared<SocketAppleSSL>();
# else # elif defined(__linux__)
_socket = std::make_shared<SocketOpenSSL>(); _socket = std::make_shared<SocketOpenSSL>();
# endif # endif
#else #else