summaryrefslogtreecommitdiff
path: root/src/conn-tools/s6-tcpserver6d.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-09-13 13:48:02 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-09-13 13:48:02 +0000
commit3f369313bfd5c06b4a32f7304a49209b4c91de10 (patch)
tree1251f31630f0f6c2af4966cf3dc444968c2d5c6d /src/conn-tools/s6-tcpserver6d.c
parent2b6b20aae8959985a42d100292aac3eca9198165 (diff)
downloads6-networking-3f369313bfd5c06b4a32f7304a49209b4c91de10.tar.xz
bugfix: spurious error message in s6-tcpserver?d when maxed connections
Diffstat (limited to 'src/conn-tools/s6-tcpserver6d.c')
-rw-r--r--src/conn-tools/s6-tcpserver6d.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conn-tools/s6-tcpserver6d.c b/src/conn-tools/s6-tcpserver6d.c
index 85128e8..5a763b5 100644
--- a/src/conn-tools/s6-tcpserver6d.c
+++ b/src/conn-tools/s6-tcpserver6d.c
@@ -349,12 +349,13 @@ int main (int argc, char const *const *argv, char const *const *envp)
while (cont)
{
- if (iopause_g(x, 1 + (numconn < maxconn), 0) < 0)
+ int h = numconn < maxconn ;
+ if (iopause_g(x, 1 + h, 0) < 0)
strerr_diefu1sys(111, "iopause") ;
if (x[0].revents & IOPAUSE_EXCEPT) strerr_dief1x(111, "trouble with selfpipe") ;
if (x[0].revents & IOPAUSE_READ) handle_signals() ;
- if (numconn < maxconn)
+ if (h)
{
if (x[1].revents & IOPAUSE_EXCEPT) strerr_dief1x(111, "trouble with socket") ;
if (x[1].revents & IOPAUSE_READ)