Change interface and span interface lists from LIST to TAILQ.

This way the configuration order is preserved.  Order matters
because MAC address are not unique: vlan interfaces can have
the same MAC as their parent.

Frames destined for the bridge itself are now delivered to
the first-configured interface that matches the MAC instead
of the last-configured.  This means that the bridge behavior
does not suddenly change anymore when adding a vlan interface.

ok henning reyk (a while ago)

2 files changed, 33 insertions, 34 deletions

diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index b6493044028..b5f2fdc52d6 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.204 2012/12/22 13:20:32 camield Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.205 2013/01/23 13:28:36 camield Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -204,8 +204,8 @@ bridge_clone_create(struct if_clone *ifc, int unit)
 	sc->sc_brtmax = BRIDGE_RTABLE_MAX;
 	sc->sc_brttimeout = BRIDGE_RTABLE_TIMEOUT;
 	timeout_set(&sc->sc_brtimeout, bridge_timer, sc);
-	LIST_INIT(&sc->sc_iflist);
-	LIST_INIT(&sc->sc_spanlist);
+	TAILQ_INIT(&sc->sc_iflist);
+	TAILQ_INIT(&sc->sc_spanlist);
 	for (i = 0; i < BRIDGE_RTABLE_SIZE; i++)
 		LIST_INIT(&sc->sc_rts[i]);
 	sc->sc_hashkey = arc4random();
@@ -246,10 +246,10 @@ bridge_clone_destroy(struct ifnet *ifp)
 
 	bridge_stop(sc);
 	bridge_rtflush(sc, IFBF_FLUSHALL);
-	while ((bif = LIST_FIRST(&sc->sc_iflist)) != NULL)
+	while ((bif = TAILQ_FIRST(&sc->sc_iflist)) != NULL)
 		bridge_delete(sc, bif);
-	while ((bif = LIST_FIRST(&sc->sc_spanlist)) != NULL) {
-		LIST_REMOVE(bif, next);
+	while ((bif = TAILQ_FIRST(&sc->sc_spanlist)) != NULL) {
+		TAILQ_REMOVE(&sc->sc_spanlist, bif, next);
 		free(bif, M_DEVBUF);
 	}
 
@@ -275,7 +275,7 @@ bridge_delete(struct bridge_softc *sc, struct bridge_iflist *p)
 	p->ifp->if_bridgeport = NULL;
 	error = ifpromisc(p->ifp, 0);
 
-	LIST_REMOVE(p, next);
+	TAILQ_REMOVE(&sc->sc_iflist, p, next);
 	bridge_rtdelete(sc, p->ifp, 0);
 	bridge_flushrule(p);
 	free(p, M_DEVBUF);
@@ -319,11 +319,10 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 
 		/* If it's in the span list, it can't be a member. */
-		LIST_FOREACH(p, &sc->sc_spanlist, next)
+		TAILQ_FOREACH(p, &sc->sc_spanlist, next)
 			if (p->ifp == ifs)
 				break;
-
-		if (p != LIST_END(&sc->sc_spanlist)) {
+		if (p != TAILQ_END(&sc->sc_spanlist)) {
 			error = EBUSY;
 			break;
 		}
@@ -389,7 +388,7 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		SIMPLEQ_INIT(&p->bif_brlin);
 		SIMPLEQ_INIT(&p->bif_brlout);
 		ifs->if_bridgeport = (caddr_t)p;
-		LIST_INSERT_HEAD(&sc->sc_iflist, p, next);
+		TAILQ_INSERT_TAIL(&sc->sc_iflist, p, next);
 		break;
 	case SIOCBRDGDEL:
 		if ((error = suser(curproc, 0)) != 0)
@@ -421,11 +420,11 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			error = EBUSY;
 			break;
 		}
-		LIST_FOREACH(p, &sc->sc_spanlist, next) {
+		TAILQ_FOREACH(p, &sc->sc_spanlist, next) {
 			if (p->ifp == ifs)
 				break;
 		}
-		if (p != LIST_END(&sc->sc_spanlist)) {
+		if (p != TAILQ_END(&sc->sc_spanlist)) {
 			error = EEXIST;
 			break;
 		}
@@ -438,20 +437,20 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		p->bif_flags = IFBIF_SPAN;
 		SIMPLEQ_INIT(&p->bif_brlin);
 		SIMPLEQ_INIT(&p->bif_brlout);
-		LIST_INSERT_HEAD(&sc->sc_spanlist, p, next);
+		TAILQ_INSERT_TAIL(&sc->sc_spanlist, p, next);
 		break;
 	case SIOCBRDGDELS:
 		if ((error = suser(curproc, 0)) != 0)
 			break;
-		LIST_FOREACH(p, &sc->sc_spanlist, next) {
+		TAILQ_FOREACH(p, &sc->sc_spanlist, next) {
 			if (strncmp(p->ifp->if_xname, req->ifbr_ifsname,
 			    sizeof(p->ifp->if_xname)) == 0) {
-				LIST_REMOVE(p, next);
+				TAILQ_REMOVE(&sc->sc_spanlist, p, next);
 				free(p, M_DEVBUF);
 				break;
 			}
 		}
-		if (p == LIST_END(&sc->sc_spanlist)) {
+		if (p == TAILQ_END(&sc->sc_spanlist)) {
 			error = ENOENT;
 			break;
 		}
@@ -747,10 +746,10 @@ bridge_bifconf(struct bridge_softc *sc, struct ifbifconf *bifc)
 	int error = 0;
 	struct ifbreq *breq = NULL;
 
-	LIST_FOREACH(p, &sc->sc_iflist, next)
+	TAILQ_FOREACH(p, &sc->sc_iflist, next)
 		total++;
 
-	LIST_FOREACH(p, &sc->sc_spanlist, next)
+	TAILQ_FOREACH(p, &sc->sc_spanlist, next)
 		total++;
 
 	if (bifc->ifbic_len == 0) {
@@ -762,7 +761,7 @@ bridge_bifconf(struct bridge_softc *sc, struct ifbifconf *bifc)
 	    malloc(sizeof(*breq), M_DEVBUF, M_NOWAIT)) == NULL)
 		goto done;
 
-	LIST_FOREACH(p, &sc->sc_iflist, next) {
+	TAILQ_FOREACH(p, &sc->sc_iflist, next) {
 		bzero(breq, sizeof(*breq));
 		if (bifc->ifbic_len < sizeof(*breq))
 			break;
@@ -802,7 +801,7 @@ bridge_bifconf(struct bridge_softc *sc, struct ifbifconf *bifc)
 		i++;
 		bifc->ifbic_len -= sizeof(*breq);
 	}
-	LIST_FOREACH(p, &sc->sc_spanlist, next) {
+	TAILQ_FOREACH(p, &sc->sc_spanlist, next) {
 		bzero(breq, sizeof(*breq));
 		if (bifc->ifbic_len < sizeof(*breq))
 			break;
@@ -1026,7 +1025,7 @@ bridge_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
 
 		bridge_span(sc, NULL, m);
 
-		LIST_FOREACH(p, &sc->sc_iflist, next) {
+		TAILQ_FOREACH(p, &sc->sc_iflist, next) {
 			dst_if = p->ifp;
 			if ((dst_if->if_flags & IFF_RUNNING) == 0)
 				continue;
@@ -1054,7 +1053,7 @@ bridge_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
 				sc->sc_if.if_oerrors++;
 				continue;
 			}
-			if (LIST_NEXT(p, next) == LIST_END(&sc->sc_iflist)) {
+			if (TAILQ_NEXT(p, next) == TAILQ_END(&sc->sc_iflist)) {
 				used = 1;
 				mc = m;
 			} else {
@@ -1394,11 +1393,11 @@ bridge_input(struct ifnet *ifp, struct ether_header *eh, struct mbuf *m)
 		splx(s);
 		schednetisr(NETISR_BRIDGE);
 		if (ifp->if_type == IFT_GIF) {
-			LIST_FOREACH(ifl, &sc->sc_iflist, next) {
+			TAILQ_FOREACH(ifl, &sc->sc_iflist, next) {
 				if (ifl->ifp->if_type == IFT_ETHER)
 					break;
 			}
-			if (ifl != LIST_END(&sc->sc_iflist)) {
+			if (ifl != TAILQ_END(&sc->sc_iflist)) {
 				m->m_pkthdr.rcvif = ifl->ifp;
 				m->m_pkthdr.rdomain = ifl->ifp->if_rdomain;
 #if NBPFILTER > 0
@@ -1426,7 +1425,7 @@ bridge_input(struct ifnet *ifp, struct ether_header *eh, struct mbuf *m)
 	 * Unicast, make sure it's not for us.
 	 */
 	srcifl = ifl;
-	LIST_FOREACH(ifl, &sc->sc_iflist, next) {
+	TAILQ_FOREACH(ifl, &sc->sc_iflist, next) {
 		if (ifl->ifp->if_type != IFT_ETHER)
 			continue;
 		ac = (struct arpcom *)ifl->ifp;
@@ -1513,7 +1512,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *ifp,
 
 	splassert(IPL_NET);
 
-	LIST_FOREACH(p, &sc->sc_iflist, next) {
+	TAILQ_FOREACH(p, &sc->sc_iflist, next) {
 		/*
 		 * Don't retransmit out of the same interface where
 		 * the packet was received from.
@@ -1553,7 +1552,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *ifp,
 		bridge_localbroadcast(sc, dst_if, eh, m);
 
 		/* If last one, reuse the passed-in mbuf */
-		if (LIST_NEXT(p, next) == LIST_END(&sc->sc_iflist)) {
+		if (TAILQ_NEXT(p, next) == TAILQ_END(&sc->sc_iflist)) {
 			mc = m;
 			used = 1;
 		} else {
@@ -1658,7 +1657,7 @@ bridge_span(struct bridge_softc *sc, struct ether_header *eh,
 	struct mbuf *mc, *m;
 	int error;
 
-	if (LIST_EMPTY(&sc->sc_spanlist))
+	if (TAILQ_EMPTY(&sc->sc_spanlist))
 		return;
 
 	m = m_copym2(morig, 0, M_COPYALL, M_NOWAIT);
@@ -1671,7 +1670,7 @@ bridge_span(struct bridge_softc *sc, struct ether_header *eh,
 		bcopy(eh, mtod(m, caddr_t), ETHER_HDR_LEN);
 	}
 
-	LIST_FOREACH(p, &sc->sc_spanlist, next) {
+	TAILQ_FOREACH(p, &sc->sc_spanlist, next) {
 		ifp = p->ifp;
 
 		if ((ifp->if_flags & IFF_RUNNING) == 0)
diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h
index 3c560ab1b61..3fb604dba6e 100644
--- a/sys/net/if_bridge.h
+++ b/sys/net/if_bridge.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.h,v 1.36 2012/10/05 17:17:04 camield Exp $	*/
+/*	$OpenBSD: if_bridge.h,v 1.37 2013/01/23 13:28:36 camield Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -383,7 +383,7 @@ struct bstp_state {
  * Bridge interface list
  */
 struct bridge_iflist {
-	LIST_ENTRY(bridge_iflist)	next;		/* next in list */
+	TAILQ_ENTRY(bridge_iflist)	next;		/* next in list */
 	struct bridge_softc		*bridge_sc;
 	struct bstp_port		*bif_stp;	/* STP port state */
 	struct brl_head			bif_brlin;	/* input rules */
@@ -426,9 +426,9 @@ struct bridge_softc {
 	u_int32_t			sc_hashkey;	/* hash key */
 	struct timeout			sc_brtimeout;	/* timeout state */
 	struct bstp_state		*sc_stp;	/* stp state */
-	LIST_HEAD(, bridge_iflist)	sc_iflist;	/* interface list */
+	TAILQ_HEAD(, bridge_iflist)	sc_iflist;	/* interface list */
+	TAILQ_HEAD(, bridge_iflist)	sc_spanlist;	/* span ports */
 	LIST_HEAD(, bridge_rtnode)	sc_rts[BRIDGE_RTABLE_SIZE];	/* hash table */
-	LIST_HEAD(, bridge_iflist)	sc_spanlist;	/* span ports */
 };
 
 extern const u_int8_t bstp_etheraddr[];