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

11
ixwebsocket/IXHttpServer.cpp
View File

@ -8,7 +8,6 @@
#include "IXNetSystem.h"
#include "IXSocketConnect.h"
#include "IXSocketFactory.h"
#include "IXUserAgent.h"
#include <fstream>
#include <iostream>
@ -70,16 +69,11 @@ namespace ix
_onConnectionCallback = callback;
}
void HttpServer::handleConnection(int fd, std::shared_ptr<ConnectionState> connectionState)
void HttpServer::handleConnection(std::shared_ptr<Socket> socket,
std::shared_ptr<ConnectionState> connectionState)
{
_connectedClientsCount++;
std::string errorMsg;
auto socket = createSocket(fd, errorMsg);
// Set the socket to non blocking mode + other tweaks
SocketConnect::configure(fd);
auto ret = Http::parseRequest(socket);
// FIXME: handle errors in parseRequest
@ -92,7 +86,6 @@ namespace ix
}
}
connectionState->setTerminated();
Socket::closeSocket(fd);
_connectedClientsCount--;
}