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

Prevent error loop on RECVFROM addresses with fork

Browse source
This commit is contained in:
Gerhard Rieger 2020-12-26 19:03:32 +01:00
parent 10680c8aad
commit ff8de6c5cd
3 changed files with 27 additions and 3 deletions

9
xio-socket.c
View file

@ -1128,6 +1128,8 @@ static pid_t xio_waitingfor; /* info from recv loop to signal handler:
that should send us the USR1 signal */
static bool xio_hashappened; /* info from signal handler to loop: child
process has read ("consumed") the packet */
static int xio_childstatus;
/* this is the signal handler for USR1 and CHLD */
void xiosigaction_hasread(int signum
#if HAVE_STRUCT_SIGACTION_SA_SIGACTION && defined(SA_SIGINFO)
@ -1179,6 +1181,7 @@ void xiosigaction_hasread(int signum
}
if (pid == xio_waitingfor) {
xio_hashappened = true;
xio_childstatus = WEXITSTATUS(status);
Debug("xiosigaction_hasread() ->");
diag_in_handler = 0;
errno = _errno;
@ -1480,6 +1483,12 @@ int _xioopen_dgram_recvfrom(struct single *xfd, int xioflags,
xio_waitingfor = 0; /* so this child will not set hashappened again */
xio_hashappened = false;
if (xio_childstatus != 0) {
char buff[512];
Recv(xfd->fd, buff, sizeof(buff), 0);
xio_childstatus = 0;
Info("drop data because of child exit failed");
}
Info("continue listening");
} else {
break;