sigmasternchen/CFloor
1
0
Fork 0
mirror of https://github.com/sigmasternchen/CFloor synced 2025-03-15 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

maybe the socket shouldn't be nonblocking

Browse source
This commit is contained in:
overflowerror 2019-03-13 19:19:09 +01:00
parent a7447fb318
commit ee08470b87
1 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/networking.c
View file

@ -147,8 +147,28 @@ void cleanup() {
debug("cleanup: %d/%d freed", freed, length); debug("cleanup: %d/%d freed", freed, length);
} }
void setNonBlocking(int fd, bool nonBlocking) {
int flags = fcntl(fd, F_GETFL);
if (flags < 0) {
warn("networking: couldn't get socket flags");
// ignore; maybe the socket is dead
return;
}
if (nonBlocking) {
flags |= O_NONBLOCK;
} else {
flags &= ~O_NONBLOCK;
}
if (fcntl(fd, F_SETFL, flags) < 0) {
error("networking: couldn't set socket flags");
return;
}
}
void setSIGIO(int fd, bool enable) { void setSIGIO(int fd, bool enable) {
// set socket to non-blocking, asynchronous // set socket to asynchronous
int flags = fcntl(fd, F_GETFL); int flags = fcntl(fd, F_GETFL);
if (flags < 0) { if (flags < 0) {
@ -156,8 +176,7 @@ void setSIGIO(int fd, bool enable) {
// ignore; maybe the socket is dead // ignore; maybe the socket is dead
return; return;
} }
flags |= O_NONBLOCK;
if (enable) { if (enable) {
flags |= O_ASYNC; flags |= O_ASYNC;
} else { } else {
@ -692,11 +711,10 @@ void* listenThread(void* _bind) {
info("networking: new connection from %s:%s", peer.addr, peer.portStr); info("networking: new connection from %s:%s", peer.addr, peer.portStr);
connection->readfd = tmp;
connection->writefd = tmp;
#ifdef SSL_SUPPORT #ifdef SSL_SUPPORT
if (bindObj->ssl_settings != NULL) { if (bindObj->ssl_settings != NULL) {
setNonBlocking(tmp, false);
struct ssl_connection* sslConnection = ssl_initConnection(bindObj->ssl_settings, tmp); struct ssl_connection* sslConnection = ssl_initConnection(bindObj->ssl_settings, tmp);
if (sslConnection == NULL) { if (sslConnection == NULL) {
free(connection); free(connection);
@ -708,9 +726,24 @@ void* listenThread(void* _bind) {
connection->sslConnection = sslConnection; connection->sslConnection = sslConnection;
connection->readfd = sslConnection->readfd; connection->readfd = sslConnection->readfd;
connection->writefd = sslConnection->writefd; connection->writefd = sslConnection->writefd;
setNonBlocking(connection->readfd, true);
setSIGIO(connection->readfd, true);
} else { } else {
connection->sslConnection = NULL; connection->sslConnection = NULL;
connection->readfd = tmp;
connection->writefd = tmp;
setNonBlocking(tmp, true);
setSIGIO(tmp, true);
} }
#else
connection->readfd = tmp;
connection->writefd = tmp;
setNonBlocking(tmp, true);
setSIGIO(tmp, true);
#endif #endif
connection->state = OPENED; connection->state = OPENED;
@ -743,8 +776,6 @@ void* listenThread(void* _bind) {
updateTiming(connection, false); updateTiming(connection, false);
linked_push(&connectionList, connection); linked_push(&connectionList, connection);
setSIGIO(tmp, true);
// trigger sigio in case we missed something // trigger sigio in case we missed something
kill(getpid(), SIGIO); kill(getpid(), SIGIO);