d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add two new flags to if_bridge(4) indicating whether the edge flag

Browse Source 
of the bridge port and path cost have been administratively set or
calculated automatically by RSTP.

Make sure to transition from non-edge to edge when the port goes down
and the edge flag was manually set before.
This is needed to comply with the condition
	((!portEnabled && AdminEdge) || ....)
in the Bridge Detection State Machine (IEE802.1D-2004, p. 171).

Reviewed by:	thompsa
Approved by:	bz (mentor)
This commit is contained in:
Shteryana Shopova 2006-12-04 14:45:02 +00:00
parent 426742bf4d
commit daacddcac8
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/net/bridgestp.c
View File

@ -1637,7 +1637,10 @@ bstp_set_edge(struct bstp_port *bp, int set)
struct bstp_state *bs = bp->bp_bs;
BSTP_LOCK(bs);
bp->bp_operedge = set;
if ((bp->bp_operedge = set) == 0)
bp->bp_flags &= ~BSTP_PORT_ADMEDGE;
else
bp->bp_flags |= BSTP_PORT_ADMEDGE;
BSTP_UNLOCK(bs);
return (0);
}
@ -1809,8 +1812,12 @@ bstp_ifupdstatus(struct bstp_state *bs, struct bstp_port *bp)
if (bp->bp_role == BSTP_ROLE_DISABLED)
bstp_enable_port(bs, bp);
} else {
if (bp->bp_role != BSTP_ROLE_DISABLED)
if (bp->bp_role != BSTP_ROLE_DISABLED) {
bstp_disable_port(bs, bp);
if ((bp->bp_flags & BSTP_PORT_ADMEDGE) &&
bp->bp_protover == BSTP_PROTO_RSTP)
bp->bp_operedge = 1;
}
}
return;
}

1
sys/net/bridgestp.h
View File

@ -109,6 +109,7 @@
#define BSTP_PORT_ADMCOST 0x0008
#define BSTP_PORT_AUTOEDGE 0x0010
#define BSTP_PORT_AUTOP2P 0x0020
#define BSTP_PORT_ADMEDGE 0x0040
/* BPDU priority */
#define BSTP_PDU_SUPERIOR 1

4
sys/net/if_bridge.c
View File

@ -1024,6 +1024,10 @@ bridge_ioctl_gifflags(struct bridge_softc *sc, void *arg)
req->ifbr_ifsflags |= IFBIF_BSTP_P2P;
if (bp->bp_flags & BSTP_PORT_AUTOP2P)
req->ifbr_ifsflags |= IFBIF_BSTP_AUTOP2P;
if (bp->bp_flags & BSTP_PORT_ADMEDGE)
req->ifbr_ifsflags |= IFBIF_BSTP_ADMEDGE;
if (bp->bp_flags & BSTP_PORT_ADMCOST)
req->ifbr_ifsflags |= IFBIF_BSTP_ADMCOST;
return (0);
}

5
sys/net/if_bridgevar.h
View File

@ -140,11 +140,14 @@ struct ifbreq {
#define IFBIF_BSTP_AUTOEDGE 0x0040 /* member stp autoedge enabled */
#define IFBIF_BSTP_P2P 0x0080 /* member stp p2p */
#define IFBIF_BSTP_AUTOP2P 0x0100 /* member stp autop2p enabled */
#define IFBIF_BSTP_ADMEDGE 0x0200 /* member stp admin edge enabled */
#define IFBIF_BSTP_ADMCOST 0x0400 /* member stp admin path cost */
#define IFBIFBITS "\020\001LEARNING\002DISCOVER\003STP\004SPAN" \
"\005STICKY\006EDGE\007AUTOEDGE\010P2P\011AUTOP2P"
#define IFBIFMASK ~(IFBIF_BSTP_EDGE|IFBIF_BSTP_AUTOEDGE|IFBIF_BSTP_P2P| \
IFBIF_BSTP_AUTOP2P) /* not saved */
IFBIF_BSTP_AUTOP2P|IFBIF_BSTP_ADMEDGE| \
IFBIF_BSTP_ADMCOST) /* not saved */
/* BRDGFLUSH */
#define IFBF_FLUSHDYN 0x00 /* flush learned addresses only */