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

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

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-09-30 21:48:55 -07:00
parent e5c8e2e7f4
commit 313949f087
14 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ixwebsocket/IXSocketServer.cpp
View File

@ -9,6 +9,7 @@
#include "IXNetSystem.h"
#include "IXSocket.h"
#include "IXSocketConnect.h"
#include "IXSocketFactory.h"
#include <assert.h>
#include <iostream>
#include <sstream>
@ -267,11 +268,25 @@ namespace ix
if (_stop) return;
// create socket
std::string errorMsg;
auto socket = createSocket(clientFd, errorMsg);
if (socket == nullptr)
{
logError("SocketServer::run() cannot create socket: " + errorMsg);
Socket::closeSocket(clientFd);
continue;
}
// Set the socket to non blocking mode + other tweaks
SocketConnect::configure(clientFd);
// Launch the handleConnection work asynchronously in its own thread.
std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
_connectionsThreads.push_back(std::make_pair(
connectionState,
std::thread(&SocketServer::handleConnection, this, clientFd, connectionState)));
std::thread(&SocketServer::handleConnection, this, socket, connectionState)));
}
}