emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogd: close/re-resolve/reopen remote sockets on some sendto() errors

Browse Source 
function                                             old     new   delta
syslogd_main                                        1201    1262     +61

Signed-off-by: Daniel Dickinson <cshore@csolve.net>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Daniel Dickinson 2010-08-03 04:26:20 +02:00 committed by Denys Vlasenko
parent 6e06da5efd
commit e74d79866c
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sysklogd/syslogd.c
View File

@ -546,7 +546,7 @@ static int try_to_resolve_remote(remoteHost_t *rh)
if (!rh->remoteAddr) if (!rh->remoteAddr)
return -1; return -1;
} }
return socket(rh->remoteAddr->u.sa.sa_family, SOCK_DGRAM, 0); return xsocket(rh->remoteAddr->u.sa.sa_family, SOCK_DGRAM, 0);
} }
#endif #endif
@ -636,11 +636,25 @@ static void do_syslogd(void)
if (rh->remoteFD == -1) if (rh->remoteFD == -1)
continue; continue;
} }
/* Send message to remote logger, ignore possible error */
/* TODO: on some errors, close and set G.remoteFD to -1 /* Send message to remote logger.
* so that DNS resolution and connect is retried? */ * On some errors, close and set remoteFD to -1
sendto(rh->remoteFD, recvbuf, sz+1, MSG_DONTWAIT, * so that DNS resolution is retried.
&(rh->remoteAddr->u.sa), rh->remoteAddr->len); */
if (sendto(rh->remoteFD, recvbuf, sz+1,
MSG_DONTWAIT | MSG_NOSIGNAL,
&(rh->remoteAddr->u.sa), rh->remoteAddr->len) == -1
) {
switch (errno) {
case ECONNRESET:
case ENOTCONN: /* paranoia */
case EPIPE:
close(rh->remoteFD);
rh->remoteFD = -1;
free(rh->remoteAddr);
rh->remoteAddr = NULL;
}
}
} }
#endif #endif
if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) { if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {