Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some error handling for an ioctl - the old code could loop tightly if

Browse Source 
the peer closed a socket unexpectedly.
This addresses one of the issues Frank Kardel patched (differently) in
PR kern/21448, after clarification from Frank via private mail.
This commit is contained in:
martin 2003-05-13 07:07:37 +00:00
parent 904079b8af
commit 6d77f1d081
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/isdn/isdnd/monitor.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: monitor.c,v 1.8 2003/05/08 08:35:40 martin Exp $ */
/* $NetBSD: monitor.c,v 1.9 2003/05/13 07:07:37 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -833,16 +833,20 @@ monitor_command(struct monitor_connection * con, int fd, int rights)
};
#define NUMCMD (sizeof cmd_tab / sizeof cmd_tab[0])
int avail, bytes;
int avail, bytes, err;
/* Network transfer may deliver two or more packets concatenated.
* Peek at the header and read only one event at a time... */
ioctl(fd, FIONREAD, &avail);
avail = 0;
err = ioctl(fd, FIONREAD, &avail);
if (avail < I4B_MON_CMD_HDR)
if (err == -1 || avail < I4B_MON_CMD_HDR)
{
if (avail == 0)
if (err == -1 && errno == EINTR)
return 0; /* try again later */
if (err == -1 || avail == 0)
{
/* logit(LL_MER, "monitor read 0 bytes"); */
/* socket closed by peer */