summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2003-10-27 06:13:44 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2003-10-27 06:13:44 +0000
commitb7e1d9e96eedda258e68fdd9bd86963719fff49a (patch)
tree9298e1edecef957173987c3df7c71422bc038466
parent2aab003115670762b35571adedd8293004258b84 (diff)
Actually stop sending advertisements if we're Master and the carp(4)
interface is brought down. Bug reported by Max Laier.
-rw-r--r--sys/netinet/ip_carp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 717a6b4140a..86f1aec1fcb 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.8 2003/10/25 12:06:59 markus Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.9 2003/10/27 06:13:43 mcbride Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -621,7 +621,7 @@ carp_send_ad(void *v)
if ((error = ip_output(m, NULL, NULL, IP_RAWOUTPUT, &sc->sc_imo, NULL)))
sc->sc_ac.ac_if.if_oerrors++;
- if (advbase)
+ if (advbase != 255 || advskew != 255)
timeout_add(&sc->sc_ad_tmo, hz * sc->sc_advbase);
}