compatibility for Windows build, removed unnecessary code

This commit is contained in:
john30
2017-02-05 12:10:12 +01:00
parent d3db9b94c0
commit 1df7df14e3
+5 -4
View File
@@ -31,6 +31,10 @@ namespace ebusd {
int Connection::m_ids = 0; int Connection::m_ids = 0;
#ifndef POLLRDHUP
#define POLLRDHUP 0
#endif
void Connection::run() { void Connection::run() {
int ret; int ret;
struct timespec tdiff; struct timespec tdiff;
@@ -113,7 +117,7 @@ void Connection::run() {
break; break;
} }
if (newData) { if (newData) {
size_t datalen = m_socket->recv(data, sizeof(data)-1); ssize_t datalen = m_socket->recv(data, sizeof(data)-1);
// remove closed socket // remove closed socket
if (datalen <= 0) { if (datalen <= 0) {
@@ -278,9 +282,6 @@ void Network::run() {
continue; continue;
} }
Connection* connection = new Connection(socket, isHttp, m_netQueue); Connection* connection = new Connection(socket, isHttp, m_netQueue);
if (connection == NULL) {
continue;
}
connection->start("connection"); connection->start("connection");
m_connections.push_back(connection); m_connections.push_back(connection);
logInfo(lf_network, "[%05d] %s connection opened %s", connection->getID(), isHttp ? "HTTP" : "client", logInfo(lf_network, "[%05d] %s connection opened %s", connection->getID(), isHttp ? "HTTP" : "client",