summaryrefslogtreecommitdiffstats
path: root/runtime/nsd_ptcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-30 14:51:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-30 14:51:45 +0200
commitb0d63ea8f26f525bbfd177aaa6a1294b0d94f1f9 (patch)
tree8ff1fa91347b213919636eb458ec8c5989e7ac3e /runtime/nsd_ptcp.c
parent055d4ffc2afc77e03a3d31720d4a0998f8c3d92c (diff)
downloadrsyslog-b0d63ea8f26f525bbfd177aaa6a1294b0d94f1f9.tar.gz
rsyslog-b0d63ea8f26f525bbfd177aaa6a1294b0d94f1f9.tar.xz
rsyslog-b0d63ea8f26f525bbfd177aaa6a1294b0d94f1f9.zip
made plain tcp syslog via TLS work on the server
... but so far only in blocking mode
Diffstat (limited to 'runtime/nsd_ptcp.c')
-rw-r--r--runtime/nsd_ptcp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/nsd_ptcp.c b/runtime/nsd_ptcp.c
index e26347c3..c4fb1cf1 100644
--- a/runtime/nsd_ptcp.c
+++ b/runtime/nsd_ptcp.c
@@ -273,6 +273,8 @@ 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;
@@ -285,6 +287,7 @@ 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;