jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-28 13:22:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix the logic to count the number of "live interfaces". With this change

Browse Source 
dhclient now terminates when the underlying ifnet is destroyed (e.g.
on card eject).

Reviewed by:	brooks
Approved by:	re (kib)
This commit is contained in:
Sam Leffler 2009-07-21 15:06:10 +00:00
parent a6d54dae20
commit f8c44ada2e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=195805
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sbin/dhclient/dispatch.c
View File

@ -144,7 +144,7 @@ reinitialize_interfaces(void)
void
dispatch(void)
{
int count, i, to_msec, nfds = 0;
int count, live_interfaces, i, to_msec, nfds = 0;
struct protocol *l;
struct pollfd *fds;
time_t howlong;
@ -188,18 +188,20 @@ another:
to_msec = -1;
/* Set up the descriptors to be polled. */
live_interfaces = 0;
for (i = 0, l = protocols; l; l = l->next) {
struct interface_info *ip = l->local;
if (ip && (l->handler != got_one || !ip->dead)) {
fds[i].fd = l->fd;
fds[i].events = POLLIN;
fds[i].revents = 0;
i++;
}
if (ip == NULL || ip->dead)
continue;
fds[i].fd = l->fd;
fds[i].events = POLLIN;
fds[i].revents = 0;
i++;
if (l->handler == got_one)
live_interfaces++;
}
if (i == 0)
if (live_interfaces == 0)
error("No live interfaces to poll on - exiting.");
/* Wait for a packet or a timeout... XXX */