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

Colin Phipps <cph@cph.demon.co.uk>: Don't block on the network socket,

Browse Source 
in case a packet gets lost between select and recv. (Debian Bug#275578)
This commit is contained in:
Joey Schulze 2004-11-02 19:30:30 +00:00
parent bd22a26134
commit b2e84809dc
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
syslogd.c
View File

@ -462,6 +462,9 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88";
* Tue May 4 16:52:01 CEST 2004: Solar Designer <solar@openwall.com> * Tue May 4 16:52:01 CEST 2004: Solar Designer <solar@openwall.com>
* Adjust the size of a variable to prevent a buffer overflow * Adjust the size of a variable to prevent a buffer overflow
* should _PATH_DEV ever contain something different than "/dev/". * should _PATH_DEV ever contain something different than "/dev/".
* Tue Nov 2 20:28:23 CET 2004: Colin Phipps <cph@cph.demon.co.uk>
* Don't block on the network socket, in case a packet gets lost
* between select and recv.
*/ */
@ -1237,6 +1240,7 @@ static int create_inet_socket()
{ {
int fd, on = 1; int fd, on = 1;
struct sockaddr_in sin; struct sockaddr_in sin;
int sockflags;
fd = socket(AF_INET, SOCK_DGRAM, 0); fd = socket(AF_INET, SOCK_DGRAM, 0);
if (fd < 0) { if (fd < 0) {
@ -1262,6 +1266,24 @@ static int create_inet_socket()
close(fd); close(fd);
return -1; return -1;
} }
/* We must not block on the network socket, in case a packet
* gets lost between select and recv, otherise the process
* will stall until the timeout, and other processes trying to
* log will also stall.
*/
if ((sockflags = fcntl(fd, F_GETFL)) != -1) {
sockflags |= O_NONBLOCK;
/*
* SETFL could fail too, so get it caught by the subsequent
* error check.
*/
sockflags = fcntl(fd, F_SETFL, sockflags);
}
if (sockflags == -1) {
logerror("fcntl(O_NONBLOCK), suspending inet");
close(fd);
return -1;
}
if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0) { if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
logerror("bind, suspending inet"); logerror("bind, suspending inet");
close(fd); close(fd);