Date: Tue, 21 Jul 2009 15:06:10 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r195805 - head/sbin/dhclient Message-ID: <200907211506.n6LF6A7h014636@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Tue Jul 21 15:06:10 2009 New Revision: 195805 URL: http://svn.freebsd.org/changeset/base/195805 Log: Fix the logic to count the number of "live interfaces". With this change dhclient now terminates when the underlying ifnet is destroyed (e.g. on card eject). Reviewed by: brooks Approved by: re (kib) Modified: head/sbin/dhclient/dispatch.c Modified: head/sbin/dhclient/dispatch.c ============================================================================== --- head/sbin/dhclient/dispatch.c Tue Jul 21 14:23:05 2009 (r195804) +++ head/sbin/dhclient/dispatch.c Tue Jul 21 15:06:10 2009 (r195805) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907211506.n6LF6A7h014636>