bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-07-16 08:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UDP-LISTEN did not honor the max-children option

Browse source
This commit is contained in:
Gerhard Rieger 2017-01-07 10:46:01 +01:00
parent 522cf716f8
commit 8e09093afd
3 changed files with 130 additions and 14 deletions

18
xio-udp.c
View file

@ -86,6 +86,7 @@ int xioopen_ipdgram_listen(int argc, const char *argv[], struct opt *opts,
int socktype = SOCK_DGRAM;
struct pollfd readfd;
bool dofork = false;
int maxchildren = 0;
pid_t pid;
char *rangename;
char infobuff[256];
@ -142,6 +143,13 @@ int xioopen_ipdgram_listen(int argc, const char *argv[], struct opt *opts,
}
}
retropt_int(opts, OPT_MAX_CHILDREN, &maxchildren);
if (! dofork && maxchildren) {
Error("option max-children not allowed without option fork");
return STAT_NORETRY;
}
#if WITH_IP4 /*|| WITH_IP6*/
if (retropt_string(opts, OPT_RANGE, &rangename) >= 0) {
if (xioparserange(rangename, pf, &fd->stream.para.socket.range) < 0) {
@ -248,6 +256,8 @@ int xioopen_ipdgram_listen(int argc, const char *argv[], struct opt *opts,
}
if (pid == 0) { /* child */
pid_t cpid = Getpid();
xiosetenvulong("PID", cpid, 1);
break;
}
@ -258,6 +268,14 @@ int xioopen_ipdgram_listen(int argc, const char *argv[], struct opt *opts,
Info2("close(%d): %s", fd->stream.fd, strerror(errno));
}
while (maxchildren) {
if (num_child < maxchildren) break;
Notice("maxchildren are active, waiting");
/* UINT_MAX would even be nicer, but Openindiana works only
with 31 bits */
while (!Sleep(INT_MAX)) ; /* any signal lets us continue */
}
Info("still listening");
continue;
}
break;