summaryrefslogtreecommitdiffstats
path: root/runtime/nsd_ptcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-30 16:35:35 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-30 16:35:35 +0200
commitc370fc6305af0fc9c37f818d8b88726b899b0d0a (patch)
treed07339f8fab9125240d11ca67aa4679e0018956e /runtime/nsd_ptcp.c
parentb0d63ea8f26f525bbfd177aaa6a1294b0d94f1f9 (diff)
downloadrsyslog-c370fc6305af0fc9c37f818d8b88726b899b0d0a.tar.gz
rsyslog-c370fc6305af0fc9c37f818d8b88726b899b0d0a.tar.xz
rsyslog-c370fc6305af0fc9c37f818d8b88726b899b0d0a.zip
server handshake now works with nonblocking sockets
Diffstat (limited to 'runtime/nsd_ptcp.c')
-rw-r--r--runtime/nsd_ptcp.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/runtime/nsd_ptcp.c b/runtime/nsd_ptcp.c
index c4fb1cf1..e26347c3 100644
--- a/runtime/nsd_ptcp.c
+++ b/runtime/nsd_ptcp.c
@@ -273,8 +273,6 @@ AcceptConnReq(nsd_t *pNsd, nsd_t **ppNew)
CHKiRet(FillRemHost(pNew, (struct sockaddr*) &addr));
-#warning "socket set to blocking for tls testing - re-enable non-blocking mode!"
-#if 0
/* set the new socket to non-blocking IO -TODO:do we really need to do this here? Do we always want it? */
if((sockflags = fcntl(iNewSock, F_GETFL)) != -1) {
sockflags |= O_NONBLOCK;
@@ -287,7 +285,6 @@ AcceptConnReq(nsd_t *pNsd, nsd_t **ppNew)
dbgprintf("error %d setting fcntl(O_NONBLOCK) on tcp socket %d", errno, iNewSock);
ABORT_FINALIZE(RS_RET_IO_ERROR);
}
-#endif
pNew->sock = iNewSock;
*ppNew = (nsd_t*) pNew;