http upgrade and connections use non blocking sockets

2018-12-09 14:07:40 -08:00
parent 49bf8bd830
commit 62528e6a0b
9 changed files with 255 additions and 110 deletions
--- a/ixwebsocket/IXSocketAppleSSL.cpp
+++ b/ixwebsocket/IXSocketAppleSSL.cpp
@ -6,6 +6,7 @@
 *  Adapted from Satori SDK Apple SSL code.
 */
 #include "IXSocketAppleSSL.h"
+#include "IXSocketConnect.h"

 #include <fcntl.h>
 #include <netdb.h>
@ -162,7 +163,7 @@ namespace ix
        {
            std::lock_guard<std::mutex> lock(_mutex);

-            _sockfd = Socket::hostname_connect(host, port, errMsg);
+            _sockfd = SocketConnect::connect(host, port, errMsg);
            if (_sockfd == -1) return false;

            _sslContext = SSLCreateContext(kCFAllocatorDefault, kSSLClientSide, kSSLStreamType);