SocketServer::handleConnection takes an std::shared_ptr<Socket> instead of a file descriptor

2019-09-30 21:48:55 -07:00
parent 562d7484e4
commit 1ed39677ce
14 changed files with 47 additions and 49 deletions
--- a/ixwebsocket/IXWebSocket.cpp
+++ b/ixwebsocket/IXWebSocket.cpp
@ -201,7 +201,8 @@ namespace ix
        return status;
    }

-    WebSocketInitResult WebSocket::connectToSocket(int fd, int timeoutSecs)
+    WebSocketInitResult WebSocket::connectToSocket(std::shared_ptr<Socket> socket,
+                                                   int timeoutSecs)
    {
        {
            std::lock_guard<std::mutex> lock(_configMutex);
@ -212,7 +213,7 @@ namespace ix
                          _pingTimeoutSecs);
        }

-        WebSocketInitResult status = _ws.connectToSocket(fd, timeoutSecs);
+        WebSocketInitResult status = _ws.connectToSocket(socket, timeoutSecs);
        if (!status.success)
        {
            return status;