 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_carp.c,v 1.36 2009/05/12 22:01:20 elad Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.37 2009/05/27 21:32:31 christos Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
  * Copyright (c) 2003 Ryan McBride. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.36 2009/05/12 22:01:20 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.37 2009/05/27 21:32:31 christos Exp $");
 /*
  * TODO:
  *	- iface reconfigure
  *	- support for hardware checksum calculations;
+ *
  */
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -687,48 +687,51 @@ carp_proto_input_c(struct mbuf *m, struc
 	ch_tv.tv_usec = ch->carp_advskew * 1000000 / 256;
 	switch (sc->sc_state) {
 	case INIT:
 		break;
 	case MASTER:
 		/*
 		 * If we receive an advertisement from a backup who's going to
 		 * be more frequent than us, go into BACKUP state.
 		 */
 		if (timercmp(&sc_tv, &ch_tv, >) ||
 		    timercmp(&sc_tv, &ch_tv, ==)) {
 			callout_stop(&sc->sc_ad_tmo);
 			CARP_LOG(sc, "MASTER -> BACKUP (more frequent advertisement received)");
 			carp_set_state(sc, BACKUP);
 			carp_setrun(sc, 0);
 			carp_setroute(sc, RTM_DELETE);
+		}
 		break;
 	case BACKUP:
 		/*
 		 * If we're pre-empting masters who advertise slower than us,
 		 * and this one claims to be slower, treat him as down.
 		 */
 		if (carp_opts[CARPCTL_PREEMPT] && timercmp(&sc_tv, &ch_tv, <)) {
 			CARP_LOG(sc, "BACKUP -> MASTER (preempting a slower master)");
 			carp_master_down(sc);
 			break;
+		}
 		/*
 		 *  If the master is going to advertise at such a low frequency
 		 *  that he's guaranteed to time out, we'd might as well just
 		 *  treat him as timed out now.
 		 */
 		sc_tv.tv_sec = sc->sc_advbase * 3;
 		if (timercmp(&sc_tv, &ch_tv, <)) {
 			CARP_LOG(sc, "BACKUP -> MASTER (master timed out)")
 			carp_master_down(sc);
 			break;
+		}
 		/*
 		 * Otherwise, we reset the counter and wait for the next
 		 * advertisement.
 		 */
 		carp_setrun(sc, af);
 		break;
+	}
 	m_freem(m);
 @@ -1378,26 +1381,27 @@ carp_input(struct mbuf *m, u_int8_t *sho
 void
 carp_master_down(void *v)
+{
 	struct carp_softc *sc = v;
 	switch (sc->sc_state) {
 	case INIT:
 		printf("%s: master_down event in INIT state\n",
 		    sc->sc_if.if_xname);
 		break;
 	case MASTER:
 		break;
 	case BACKUP:
 		CARP_LOG(sc, "INIT -> MASTER (preempting)");
 		carp_set_state(sc, MASTER);
 		carp_send_ad(sc);
 		carp_send_arp(sc);
 #ifdef INET6
 		carp_send_na(sc);
 #endif /* INET6 */
 		carp_setrun(sc, 0);
 		carp_setroute(sc, RTM_ADD);
 		break;
+	}
+}
 /*
 @@ -2042,29 +2046,32 @@ carp_output(struct ifnet *ifp, struct mb
 	struct carp_softc *sc = ((struct carp_softc *)ifp->if_softc);
 	if (sc->sc_carpdev != NULL && sc->sc_state == MASTER) {
 		return (sc->sc_carpdev->if_output(ifp, m, sa, rt));
 	} else {
 		m_freem(m);
 		return (ENETUNREACH);
+	}
+}
 void
 carp_set_state(struct carp_softc *sc, int state)
+{
 	static const char *carp_states[] = { CARP_STATES };
 	if (sc->sc_state == state)
 		return;
 	CARP_LOG(sc, ("state transition from: %s -> to: %s", carp_states[sc->sc_state], carp_states[state]));
 	sc->sc_state = state;
 	switch (state) {
 	case BACKUP:
 		sc->sc_if.if_link_state = LINK_STATE_DOWN;
 		break;
 	case MASTER:
 		sc->sc_if.if_link_state = LINK_STATE_UP;
 		break;
 	default:
 		sc->sc_if.if_link_state = LINK_STATE_UNKNOWN;
 		break;
+	}
 	rt_ifmsg(&sc->sc_if);