summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2012-10-11 08:05:06 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2012-10-11 08:05:06 +0000
commitedb70c2f0cfc0b0de7b3260bd50a5e83e8b7d233 (patch)
treebdd6063a4d9e69e8b5446941a1475f8ee872db31
parenteb0850f322ed78963a733146388cd6229d87b100 (diff)
Remove the new (as of r1.56) line of code which updates ifi->linkstat in
the dispatch loop again; in the case where two RTM_IFINFO link changes occur immediately after each other (as in the case with trunk and probably vlan) dhclient missed the state change of the second interface. ok krw@, who points out that dhcp packets received between the two RTM_IFINFO messages would be lost, however the window is small (<0.4ms on my laptop) and this is better than not noticing the link change.
-rw-r--r--sbin/dhclient/dispatch.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index d5662e3f805..32a28e4e6d1 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dispatch.c,v 1.58 2012/09/18 09:34:09 krw Exp $ */
+/* $OpenBSD: dispatch.c,v 1.59 2012/10/11 08:05:05 sthen Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -121,8 +121,6 @@ dispatch(void)
another:
if (!ifi)
error("No interfaces available");
-
- ifi->linkstat = interface_status(ifi->name);
if (ifi->rdomain != get_rdomain(ifi->name))
error("Interface %s:"