/*
- * Copyright (c) 2004-2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2019 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <sys/cdefs.h>
-#define BRIDGE_DEBUG 1
+#define BRIDGE_DEBUG 1
#include <sys/param.h>
#include <sys/mbuf.h>
#include <net/if_types.h>
#include <net/if_var.h>
#include <net/if_media.h>
+#include <net/net_api_stats.h>
#include <netinet/in.h> /* for struct arpcom */
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
-#define _IP_VHL
+#define _IP_VHL
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#if INET6
#include <netinet/bootp.h>
#include <netinet/dhcp.h>
+
#if BRIDGE_DEBUG
-#define BR_DBGF_LIFECYCLE 0x0001
-#define BR_DBGF_INPUT 0x0002
-#define BR_DBGF_OUTPPUT 0x0004
-#define BR_DBGF_RT_TABLE 0x0008
-#define BR_DBGF_DELAYED_CALL 0x0010
-#define BR_DBGF_IOCTL 0x0020
-#define BR_DBGF_MBUF 0x0040
-#define BR_DBGF_MCAST 0x0080
-#define BR_DBGF_HOSTFILTER 0x0100
+#define BR_DBGF_LIFECYCLE 0x0001
+#define BR_DBGF_INPUT 0x0002
+#define BR_DBGF_OUTPUT 0x0004
+#define BR_DBGF_RT_TABLE 0x0008
+#define BR_DBGF_DELAYED_CALL 0x0010
+#define BR_DBGF_IOCTL 0x0020
+#define BR_DBGF_MBUF 0x0040
+#define BR_DBGF_MCAST 0x0080
+#define BR_DBGF_HOSTFILTER 0x0100
+#define BR_DBGF_CHECKSUM 0x0200
#endif /* BRIDGE_DEBUG */
-#define _BRIDGE_LOCK(_sc) lck_mtx_lock(&(_sc)->sc_mtx)
-#define _BRIDGE_UNLOCK(_sc) lck_mtx_unlock(&(_sc)->sc_mtx)
-#define BRIDGE_LOCK_ASSERT_HELD(_sc) \
- lck_mtx_assert(&(_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED)
-#define BRIDGE_LOCK_ASSERT_NOTHELD(_sc) \
- lck_mtx_assert(&(_sc)->sc_mtx, LCK_MTX_ASSERT_NOTOWNED)
+#define _BRIDGE_LOCK(_sc) lck_mtx_lock(&(_sc)->sc_mtx)
+#define _BRIDGE_UNLOCK(_sc) lck_mtx_unlock(&(_sc)->sc_mtx)
+#define BRIDGE_LOCK_ASSERT_HELD(_sc) \
+ LCK_MTX_ASSERT(&(_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED)
+#define BRIDGE_LOCK_ASSERT_NOTHELD(_sc) \
+ LCK_MTX_ASSERT(&(_sc)->sc_mtx, LCK_MTX_ASSERT_NOTOWNED)
#if BRIDGE_DEBUG
-#define BR_LCKDBG_MAX 4
+#define BR_LCKDBG_MAX 4
-#define BRIDGE_LOCK(_sc) bridge_lock(_sc)
-#define BRIDGE_UNLOCK(_sc) bridge_unlock(_sc)
-#define BRIDGE_LOCK2REF(_sc, _err) _err = bridge_lock2ref(_sc)
-#define BRIDGE_UNREF(_sc) bridge_unref(_sc)
-#define BRIDGE_XLOCK(_sc) bridge_xlock(_sc)
-#define BRIDGE_XDROP(_sc) bridge_xdrop(_sc)
+#define BRIDGE_LOCK(_sc) bridge_lock(_sc)
+#define BRIDGE_UNLOCK(_sc) bridge_unlock(_sc)
+#define BRIDGE_LOCK2REF(_sc, _err) _err = bridge_lock2ref(_sc)
+#define BRIDGE_UNREF(_sc) bridge_unref(_sc)
+#define BRIDGE_XLOCK(_sc) bridge_xlock(_sc)
+#define BRIDGE_XDROP(_sc) bridge_xdrop(_sc)
#else /* !BRIDGE_DEBUG */
-#define BRIDGE_LOCK(_sc) _BRIDGE_LOCK(_sc)
-#define BRIDGE_UNLOCK(_sc) _BRIDGE_UNLOCK(_sc)
-#define BRIDGE_LOCK2REF(_sc, _err) do { \
- BRIDGE_LOCK_ASSERT_HELD(_sc); \
- if ((_sc)->sc_iflist_xcnt > 0) \
- (_err) = EBUSY; \
- else \
- (_sc)->sc_iflist_ref++; \
- _BRIDGE_UNLOCK(_sc); \
+#define BRIDGE_LOCK(_sc) _BRIDGE_LOCK(_sc)
+#define BRIDGE_UNLOCK(_sc) _BRIDGE_UNLOCK(_sc)
+#define BRIDGE_LOCK2REF(_sc, _err) do { \
+ BRIDGE_LOCK_ASSERT_HELD(_sc); \
+ if ((_sc)->sc_iflist_xcnt > 0) \
+ (_err) = EBUSY; \
+ else \
+ (_sc)->sc_iflist_ref++; \
+ _BRIDGE_UNLOCK(_sc); \
} while (0)
-#define BRIDGE_UNREF(_sc) do { \
- _BRIDGE_LOCK(_sc); \
- (_sc)->sc_iflist_ref--; \
+#define BRIDGE_UNREF(_sc) do { \
+ _BRIDGE_LOCK(_sc); \
+ (_sc)->sc_iflist_ref--; \
if (((_sc)->sc_iflist_xcnt > 0) && ((_sc)->sc_iflist_ref == 0)) { \
- _BRIDGE_UNLOCK(_sc); \
- wakeup(&(_sc)->sc_cv); \
- } else \
- _BRIDGE_UNLOCK(_sc); \
+ _BRIDGE_UNLOCK(_sc); \
+ wakeup(&(_sc)->sc_cv); \
+ } else \
+ _BRIDGE_UNLOCK(_sc); \
} while (0)
-#define BRIDGE_XLOCK(_sc) do { \
- BRIDGE_LOCK_ASSERT_HELD(_sc); \
- (_sc)->sc_iflist_xcnt++; \
- while ((_sc)->sc_iflist_ref > 0) \
- msleep(&(_sc)->sc_cv, &(_sc)->sc_mtx, PZERO, \
- "BRIDGE_XLOCK", NULL); \
+#define BRIDGE_XLOCK(_sc) do { \
+ BRIDGE_LOCK_ASSERT_HELD(_sc); \
+ (_sc)->sc_iflist_xcnt++; \
+ while ((_sc)->sc_iflist_ref > 0) \
+ msleep(&(_sc)->sc_cv, &(_sc)->sc_mtx, PZERO, \
+ "BRIDGE_XLOCK", NULL); \
} while (0)
-#define BRIDGE_XDROP(_sc) do { \
- BRIDGE_LOCK_ASSERT_HELD(_sc); \
- (_sc)->sc_iflist_xcnt--; \
+#define BRIDGE_XDROP(_sc) do { \
+ BRIDGE_LOCK_ASSERT_HELD(_sc); \
+ (_sc)->sc_iflist_xcnt--; \
} while (0)
#endif /* BRIDGE_DEBUG */
#if NBPFILTER > 0
-#define BRIDGE_BPF_MTAP_INPUT(sc, m) \
- if (sc->sc_bpf_input) \
- bridge_bpf_input(sc->sc_ifp, m)
+#define BRIDGE_BPF_MTAP_INPUT(sc, m) \
+ if (sc->sc_bpf_input) \
+ bridge_bpf_input(sc->sc_ifp, m)
#else /* NBPFILTER */
-#define BRIDGE_BPF_MTAP_INPUT(ifp, m)
+#define BRIDGE_BPF_MTAP_INPUT(ifp, m)
#endif /* NBPFILTER */
/*
* Initial size of the route hash table. Must be a power of two.
*/
#ifndef BRIDGE_RTHASH_SIZE
-#define BRIDGE_RTHASH_SIZE 16
+#define BRIDGE_RTHASH_SIZE 16
#endif
/*
* Maximum size of the routing hash table
*/
-#define BRIDGE_RTHASH_SIZE_MAX 2048
+#define BRIDGE_RTHASH_SIZE_MAX 2048
-#define BRIDGE_RTHASH_MASK(sc) ((sc)->sc_rthash_size - 1)
+#define BRIDGE_RTHASH_MASK(sc) ((sc)->sc_rthash_size - 1)
/*
* Maximum number of addresses to cache.
*/
#ifndef BRIDGE_RTABLE_MAX
-#define BRIDGE_RTABLE_MAX 100
+#define BRIDGE_RTABLE_MAX 100
#endif
* Timeout (in seconds) for entries learned dynamically.
*/
#ifndef BRIDGE_RTABLE_TIMEOUT
-#define BRIDGE_RTABLE_TIMEOUT (20 * 60) /* same as ARP */
+#define BRIDGE_RTABLE_TIMEOUT (20 * 60) /* same as ARP */
#endif
/*
* Number of seconds between walks of the route list.
*/
#ifndef BRIDGE_RTABLE_PRUNE_PERIOD
-#define BRIDGE_RTABLE_PRUNE_PERIOD (5 * 60)
+#define BRIDGE_RTABLE_PRUNE_PERIOD (5 * 60)
#endif
/*
* List of capabilities to possibly mask on the member interface.
*/
-#define BRIDGE_IFCAPS_MASK (IFCAP_TOE|IFCAP_TSO|IFCAP_TXCSUM)
+#define BRIDGE_IFCAPS_MASK (IFCAP_TOE|IFCAP_TSO|IFCAP_TXCSUM)
/*
* List of capabilities to disable on the member interface.
*/
-#define BRIDGE_IFCAPS_STRIP IFCAP_LRO
+#define BRIDGE_IFCAPS_STRIP IFCAP_LRO
/*
* Bridge interface list entry.
*/
struct bridge_iflist {
TAILQ_ENTRY(bridge_iflist) bif_next;
- struct ifnet *bif_ifp; /* member if */
- struct bstp_port bif_stp; /* STP state */
- uint32_t bif_ifflags; /* member if flags */
- int bif_savedcaps; /* saved capabilities */
- uint32_t bif_addrmax; /* max # of addresses */
- uint32_t bif_addrcnt; /* cur. # of addresses */
- uint32_t bif_addrexceeded; /* # of address violations */
-
- interface_filter_t bif_iff_ref;
- struct bridge_softc *bif_sc;
- uint32_t bif_flags;
-
- struct in_addr bif_hf_ipsrc;
- uint8_t bif_hf_hwsrc[ETHER_ADDR_LEN];
+ struct ifnet *bif_ifp; /* member if */
+ struct bstp_port bif_stp; /* STP state */
+ uint32_t bif_ifflags; /* member if flags */
+ int bif_savedcaps; /* saved capabilities */
+ uint32_t bif_addrmax; /* max # of addresses */
+ uint32_t bif_addrcnt; /* cur. # of addresses */
+ uint32_t bif_addrexceeded; /* # of address violations */
+
+ interface_filter_t bif_iff_ref;
+ struct bridge_softc *bif_sc;
+ uint32_t bif_flags;
+
+ struct in_addr bif_hf_ipsrc;
+ uint8_t bif_hf_hwsrc[ETHER_ADDR_LEN];
};
-#define BIFF_PROMISC 0x01 /* promiscuous mode set */
-#define BIFF_PROTO_ATTACHED 0x02 /* protocol attached */
-#define BIFF_FILTER_ATTACHED 0x04 /* interface filter attached */
-#define BIFF_MEDIA_ACTIVE 0x08 /* interface media active */
-#define BIFF_HOST_FILTER 0x10 /* host filter enabled */
-#define BIFF_HF_HWSRC 0x20 /* host filter source MAC is set */
-#define BIFF_HF_IPSRC 0x40 /* host filter source IP is set */
+#define BIFF_PROMISC 0x01 /* promiscuous mode set */
+#define BIFF_PROTO_ATTACHED 0x02 /* protocol attached */
+#define BIFF_FILTER_ATTACHED 0x04 /* interface filter attached */
+#define BIFF_MEDIA_ACTIVE 0x08 /* interface media active */
+#define BIFF_HOST_FILTER 0x10 /* host filter enabled */
+#define BIFF_HF_HWSRC 0x20 /* host filter source MAC is set */
+#define BIFF_HF_IPSRC 0x40 /* host filter source IP is set */
+#define BIFF_INPUT_BROADCAST 0x80 /* send broadcast packets in */
/*
* Bridge route node.
*/
struct bridge_rtnode {
- LIST_ENTRY(bridge_rtnode) brt_hash; /* hash table linkage */
- LIST_ENTRY(bridge_rtnode) brt_list; /* list linkage */
- struct bridge_iflist *brt_dst; /* destination if */
- unsigned long brt_expire; /* expiration time */
- uint8_t brt_flags; /* address flags */
- uint8_t brt_addr[ETHER_ADDR_LEN];
- uint16_t brt_vlan; /* vlan id */
+ LIST_ENTRY(bridge_rtnode) brt_hash; /* hash table linkage */
+ LIST_ENTRY(bridge_rtnode) brt_list; /* list linkage */
+ struct bridge_iflist *brt_dst; /* destination if */
+ unsigned long brt_expire; /* expiration time */
+ uint8_t brt_flags; /* address flags */
+ uint8_t brt_addr[ETHER_ADDR_LEN];
+ uint16_t brt_vlan; /* vlan id */
};
-#define brt_ifp brt_dst->bif_ifp
+#define brt_ifp brt_dst->bif_ifp
/*
* Bridge delayed function call context
typedef void (*bridge_delayed_func_t)(struct bridge_softc *);
struct bridge_delayed_call {
- struct bridge_softc *bdc_sc;
- bridge_delayed_func_t bdc_func; /* Function to call */
- struct timespec bdc_ts; /* Time to call */
- u_int32_t bdc_flags;
- thread_call_t bdc_thread_call;
+ struct bridge_softc *bdc_sc;
+ bridge_delayed_func_t bdc_func; /* Function to call */
+ struct timespec bdc_ts; /* Time to call */
+ u_int32_t bdc_flags;
+ thread_call_t bdc_thread_call;
};
-#define BDCF_OUTSTANDING 0x01 /* Delayed call has been scheduled */
-#define BDCF_CANCELLING 0x02 /* May be waiting for call completion */
+#define BDCF_OUTSTANDING 0x01 /* Delayed call has been scheduled */
+#define BDCF_CANCELLING 0x02 /* May be waiting for call completion */
/*
* Software state for each bridge.
*/
-
LIST_HEAD(_bridge_rtnode_list, bridge_rtnode);
struct bridge_softc {
- struct ifnet *sc_ifp; /* make this an interface */
+ struct ifnet *sc_ifp; /* make this an interface */
+ u_int32_t sc_flags;
LIST_ENTRY(bridge_softc) sc_list;
- decl_lck_mtx_data(, sc_mtx);
- void *sc_cv;
- uint32_t sc_brtmax; /* max # of addresses */
- uint32_t sc_brtcnt; /* cur. # of addresses */
- uint32_t sc_brttimeout; /* rt timeout in seconds */
- uint32_t sc_iflist_ref; /* refcount for sc_iflist */
- uint32_t sc_iflist_xcnt; /* refcount for sc_iflist */
- TAILQ_HEAD(, bridge_iflist) sc_iflist; /* member interface list */
- struct _bridge_rtnode_list *sc_rthash; /* our forwarding table */
- struct _bridge_rtnode_list sc_rtlist; /* list version of above */
- uint32_t sc_rthash_key; /* key for hash */
- uint32_t sc_rthash_size; /* size of the hash table */
- TAILQ_HEAD(, bridge_iflist) sc_spanlist; /* span ports list */
- struct bstp_state sc_stp; /* STP state */
- uint32_t sc_brtexceeded; /* # of cache drops */
- uint32_t sc_filter_flags; /* ipf and flags */
- struct ifnet *sc_ifaddr; /* member mac copied from */
- u_char sc_defaddr[6]; /* Default MAC address */
-
- char sc_if_xname[IFNAMSIZ];
- bpf_packet_func sc_bpf_input;
- bpf_packet_func sc_bpf_output;
- u_int32_t sc_flags;
+ decl_lck_mtx_data(, sc_mtx);
+ struct _bridge_rtnode_list *sc_rthash; /* our forwarding table */
+ struct _bridge_rtnode_list sc_rtlist; /* list version of above */
+ uint32_t sc_rthash_key; /* key for hash */
+ uint32_t sc_rthash_size; /* size of the hash table */
struct bridge_delayed_call sc_aging_timer;
struct bridge_delayed_call sc_resize_call;
+ TAILQ_HEAD(, bridge_iflist) sc_spanlist; /* span ports list */
+ struct bstp_state sc_stp; /* STP state */
+ bpf_packet_func sc_bpf_input;
+ bpf_packet_func sc_bpf_output;
+ void *sc_cv;
+ uint32_t sc_brtmax; /* max # of addresses */
+ uint32_t sc_brtcnt; /* cur. # of addresses */
+ uint32_t sc_brttimeout; /* rt timeout in seconds */
+ uint32_t sc_iflist_ref; /* refcount for sc_iflist */
+ uint32_t sc_iflist_xcnt; /* refcount for sc_iflist */
+ TAILQ_HEAD(, bridge_iflist) sc_iflist; /* member interface list */
+ uint32_t sc_brtexceeded; /* # of cache drops */
+ uint32_t sc_filter_flags; /* ipf and flags */
+ struct ifnet *sc_ifaddr; /* member mac copied from */
+ u_char sc_defaddr[6]; /* Default MAC address */
+ char sc_if_xname[IFNAMSIZ];
#if BRIDGE_DEBUG
/*
* Locking and unlocking calling history
*/
- void *lock_lr[BR_LCKDBG_MAX];
- int next_lock_lr;
- void *unlock_lr[BR_LCKDBG_MAX];
- int next_unlock_lr;
+ void *lock_lr[BR_LCKDBG_MAX];
+ int next_lock_lr;
+ void *unlock_lr[BR_LCKDBG_MAX];
+ int next_unlock_lr;
#endif /* BRIDGE_DEBUG */
};
-#define SCF_DETACHING 0x01
-#define SCF_RESIZING 0x02
-#define SCF_MEDIA_ACTIVE 0x04
+#define SCF_DETACHING 0x01
+#define SCF_RESIZING 0x02
+#define SCF_MEDIA_ACTIVE 0x04
+
+typedef enum {
+ kChecksumOperationNone = 0,
+ kChecksumOperationClear = 1,
+ kChecksumOperationFinalize = 2,
+ kChecksumOperationCompute = 3,
+} ChecksumOperation;
struct bridge_hostfilter_stats bridge_hostfilter_stats;
decl_lck_mtx_data(static, bridge_list_mtx);
-static int bridge_rtable_prune_period = BRIDGE_RTABLE_PRUNE_PERIOD;
+static int bridge_rtable_prune_period = BRIDGE_RTABLE_PRUNE_PERIOD;
-static zone_t bridge_rtnode_pool = NULL;
+static zone_t bridge_rtnode_pool = NULL;
-static int bridge_clone_create(struct if_clone *, uint32_t, void *);
-static int bridge_clone_destroy(struct ifnet *);
+static int bridge_clone_create(struct if_clone *, uint32_t, void *);
+static int bridge_clone_destroy(struct ifnet *);
-static errno_t bridge_ioctl(struct ifnet *, u_long, void *);
+static errno_t bridge_ioctl(struct ifnet *, u_long, void *);
#if HAS_IF_CAP
-static void bridge_mutecaps(struct bridge_softc *);
-static void bridge_set_ifcap(struct bridge_softc *, struct bridge_iflist *,
- int);
+static void bridge_mutecaps(struct bridge_softc *);
+static void bridge_set_ifcap(struct bridge_softc *, struct bridge_iflist *,
+ int);
#endif
static errno_t bridge_set_tso(struct bridge_softc *);
-__private_extern__ void bridge_ifdetach(struct bridge_iflist *, struct ifnet *);
-static int bridge_init(struct ifnet *);
+static void bridge_ifdetach(struct ifnet *);
+static void bridge_proto_attach_changed(struct ifnet *);
+static int bridge_init(struct ifnet *);
#if HAS_BRIDGE_DUMMYNET
-static void bridge_dummynet(struct mbuf *, struct ifnet *);
+static void bridge_dummynet(struct mbuf *, struct ifnet *);
#endif
-static void bridge_ifstop(struct ifnet *, int);
-static int bridge_output(struct ifnet *, struct mbuf *);
-static void bridge_finalize_cksum(struct ifnet *, struct mbuf *);
-static void bridge_start(struct ifnet *);
+static void bridge_ifstop(struct ifnet *, int);
+static int bridge_output(struct ifnet *, struct mbuf *);
+static void bridge_finalize_cksum(struct ifnet *, struct mbuf *);
+static void bridge_start(struct ifnet *);
__private_extern__ errno_t bridge_input(struct ifnet *, struct mbuf *, void *);
-#if BRIDGE_MEMBER_OUT_FILTER
-static errno_t bridge_iff_output(void *, ifnet_t, protocol_family_t,
- mbuf_t *);
-static int bridge_member_output(struct ifnet *, struct mbuf *,
- struct sockaddr *, struct rtentry *);
-#endif
-static int bridge_enqueue(struct bridge_softc *, struct ifnet *,
- struct mbuf *);
-static void bridge_rtdelete(struct bridge_softc *, struct ifnet *ifp, int);
+static errno_t bridge_iff_output(void *, ifnet_t, protocol_family_t,
+ mbuf_t *);
+static errno_t bridge_member_output(struct bridge_softc *sc, ifnet_t ifp,
+ mbuf_t m);
-static void bridge_forward(struct bridge_softc *, struct bridge_iflist *,
- struct mbuf *);
+static int bridge_enqueue(struct bridge_softc *, struct ifnet *,
+ struct ifnet *, struct mbuf *, ChecksumOperation);
+static void bridge_rtdelete(struct bridge_softc *, struct ifnet *ifp, int);
-static void bridge_aging_timer(struct bridge_softc *sc);
+static void bridge_forward(struct bridge_softc *, struct bridge_iflist *,
+ struct mbuf *);
-static void bridge_broadcast(struct bridge_softc *, struct ifnet *,
- struct mbuf *, int);
-static void bridge_span(struct bridge_softc *, struct mbuf *);
+static void bridge_aging_timer(struct bridge_softc *sc);
-static int bridge_rtupdate(struct bridge_softc *, const uint8_t *,
- uint16_t, struct bridge_iflist *, int, uint8_t);
+static void bridge_broadcast(struct bridge_softc *, struct ifnet *,
+ struct mbuf *, int);
+static void bridge_span(struct bridge_softc *, struct mbuf *);
+
+static int bridge_rtupdate(struct bridge_softc *, const uint8_t *,
+ uint16_t, struct bridge_iflist *, int, uint8_t);
static struct ifnet *bridge_rtlookup(struct bridge_softc *, const uint8_t *,
- uint16_t);
-static void bridge_rttrim(struct bridge_softc *);
-static void bridge_rtage(struct bridge_softc *);
-static void bridge_rtflush(struct bridge_softc *, int);
-static int bridge_rtdaddr(struct bridge_softc *, const uint8_t *,
- uint16_t);
+ uint16_t);
+static void bridge_rttrim(struct bridge_softc *);
+static void bridge_rtage(struct bridge_softc *);
+static void bridge_rtflush(struct bridge_softc *, int);
+static int bridge_rtdaddr(struct bridge_softc *, const uint8_t *,
+ uint16_t);
-static int bridge_rtable_init(struct bridge_softc *);
-static void bridge_rtable_fini(struct bridge_softc *);
+static int bridge_rtable_init(struct bridge_softc *);
+static void bridge_rtable_fini(struct bridge_softc *);
-static void bridge_rthash_resize(struct bridge_softc *);
+static void bridge_rthash_resize(struct bridge_softc *);
-static int bridge_rtnode_addr_cmp(const uint8_t *, const uint8_t *);
+static int bridge_rtnode_addr_cmp(const uint8_t *, const uint8_t *);
static struct bridge_rtnode *bridge_rtnode_lookup(struct bridge_softc *,
- const uint8_t *, uint16_t);
-static int bridge_rtnode_hash(struct bridge_softc *,
- struct bridge_rtnode *);
-static int bridge_rtnode_insert(struct bridge_softc *,
- struct bridge_rtnode *);
-static void bridge_rtnode_destroy(struct bridge_softc *,
- struct bridge_rtnode *);
+ const uint8_t *, uint16_t);
+static int bridge_rtnode_hash(struct bridge_softc *,
+ struct bridge_rtnode *);
+static int bridge_rtnode_insert(struct bridge_softc *,
+ struct bridge_rtnode *);
+static void bridge_rtnode_destroy(struct bridge_softc *,
+ struct bridge_rtnode *);
#if BRIDGESTP
-static void bridge_rtable_expire(struct ifnet *, int);
-static void bridge_state_change(struct ifnet *, int);
+static void bridge_rtable_expire(struct ifnet *, int);
+static void bridge_state_change(struct ifnet *, int);
#endif /* BRIDGESTP */
static struct bridge_iflist *bridge_lookup_member(struct bridge_softc *,
- const char *name);
+ const char *name);
static struct bridge_iflist *bridge_lookup_member_if(struct bridge_softc *,
- struct ifnet *ifp);
-static void bridge_delete_member(struct bridge_softc *,
- struct bridge_iflist *, int);
-static void bridge_delete_span(struct bridge_softc *,
- struct bridge_iflist *);
-
-static int bridge_ioctl_add(struct bridge_softc *, void *);
-static int bridge_ioctl_del(struct bridge_softc *, void *);
-static int bridge_ioctl_gifflags(struct bridge_softc *, void *);
-static int bridge_ioctl_sifflags(struct bridge_softc *, void *);
-static int bridge_ioctl_scache(struct bridge_softc *, void *);
-static int bridge_ioctl_gcache(struct bridge_softc *, void *);
-static int bridge_ioctl_gifs32(struct bridge_softc *, void *);
-static int bridge_ioctl_gifs64(struct bridge_softc *, void *);
-static int bridge_ioctl_rts32(struct bridge_softc *, void *);
-static int bridge_ioctl_rts64(struct bridge_softc *, void *);
-static int bridge_ioctl_saddr32(struct bridge_softc *, void *);
-static int bridge_ioctl_saddr64(struct bridge_softc *, void *);
-static int bridge_ioctl_sto(struct bridge_softc *, void *);
-static int bridge_ioctl_gto(struct bridge_softc *, void *);
-static int bridge_ioctl_daddr32(struct bridge_softc *, void *);
-static int bridge_ioctl_daddr64(struct bridge_softc *, void *);
-static int bridge_ioctl_flush(struct bridge_softc *, void *);
-static int bridge_ioctl_gpri(struct bridge_softc *, void *);
-static int bridge_ioctl_spri(struct bridge_softc *, void *);
-static int bridge_ioctl_ght(struct bridge_softc *, void *);
-static int bridge_ioctl_sht(struct bridge_softc *, void *);
-static int bridge_ioctl_gfd(struct bridge_softc *, void *);
-static int bridge_ioctl_sfd(struct bridge_softc *, void *);
-static int bridge_ioctl_gma(struct bridge_softc *, void *);
-static int bridge_ioctl_sma(struct bridge_softc *, void *);
-static int bridge_ioctl_sifprio(struct bridge_softc *, void *);
-static int bridge_ioctl_sifcost(struct bridge_softc *, void *);
-static int bridge_ioctl_sifmaxaddr(struct bridge_softc *, void *);
-static int bridge_ioctl_addspan(struct bridge_softc *, void *);
-static int bridge_ioctl_delspan(struct bridge_softc *, void *);
-static int bridge_ioctl_gbparam32(struct bridge_softc *, void *);
-static int bridge_ioctl_gbparam64(struct bridge_softc *, void *);
-static int bridge_ioctl_grte(struct bridge_softc *, void *);
-static int bridge_ioctl_gifsstp32(struct bridge_softc *, void *);
-static int bridge_ioctl_gifsstp64(struct bridge_softc *, void *);
-static int bridge_ioctl_sproto(struct bridge_softc *, void *);
-static int bridge_ioctl_stxhc(struct bridge_softc *, void *);
-static int bridge_ioctl_purge(struct bridge_softc *sc, void *);
-static int bridge_ioctl_gfilt(struct bridge_softc *, void *);
-static int bridge_ioctl_sfilt(struct bridge_softc *, void *);
-static int bridge_ioctl_ghostfilter(struct bridge_softc *, void *);
-static int bridge_ioctl_shostfilter(struct bridge_softc *, void *);
+ struct ifnet *ifp);
+static void bridge_delete_member(struct bridge_softc *,
+ struct bridge_iflist *, int);
+static void bridge_delete_span(struct bridge_softc *,
+ struct bridge_iflist *);
+
+static int bridge_ioctl_add(struct bridge_softc *, void *);
+static int bridge_ioctl_del(struct bridge_softc *, void *);
+static int bridge_ioctl_gifflags(struct bridge_softc *, void *);
+static int bridge_ioctl_sifflags(struct bridge_softc *, void *);
+static int bridge_ioctl_scache(struct bridge_softc *, void *);
+static int bridge_ioctl_gcache(struct bridge_softc *, void *);
+static int bridge_ioctl_gifs32(struct bridge_softc *, void *);
+static int bridge_ioctl_gifs64(struct bridge_softc *, void *);
+static int bridge_ioctl_rts32(struct bridge_softc *, void *);
+static int bridge_ioctl_rts64(struct bridge_softc *, void *);
+static int bridge_ioctl_saddr32(struct bridge_softc *, void *);
+static int bridge_ioctl_saddr64(struct bridge_softc *, void *);
+static int bridge_ioctl_sto(struct bridge_softc *, void *);
+static int bridge_ioctl_gto(struct bridge_softc *, void *);
+static int bridge_ioctl_daddr32(struct bridge_softc *, void *);
+static int bridge_ioctl_daddr64(struct bridge_softc *, void *);
+static int bridge_ioctl_flush(struct bridge_softc *, void *);
+static int bridge_ioctl_gpri(struct bridge_softc *, void *);
+static int bridge_ioctl_spri(struct bridge_softc *, void *);
+static int bridge_ioctl_ght(struct bridge_softc *, void *);
+static int bridge_ioctl_sht(struct bridge_softc *, void *);
+static int bridge_ioctl_gfd(struct bridge_softc *, void *);
+static int bridge_ioctl_sfd(struct bridge_softc *, void *);
+static int bridge_ioctl_gma(struct bridge_softc *, void *);
+static int bridge_ioctl_sma(struct bridge_softc *, void *);
+static int bridge_ioctl_sifprio(struct bridge_softc *, void *);
+static int bridge_ioctl_sifcost(struct bridge_softc *, void *);
+static int bridge_ioctl_sifmaxaddr(struct bridge_softc *, void *);
+static int bridge_ioctl_addspan(struct bridge_softc *, void *);
+static int bridge_ioctl_delspan(struct bridge_softc *, void *);
+static int bridge_ioctl_gbparam32(struct bridge_softc *, void *);
+static int bridge_ioctl_gbparam64(struct bridge_softc *, void *);
+static int bridge_ioctl_grte(struct bridge_softc *, void *);
+static int bridge_ioctl_gifsstp32(struct bridge_softc *, void *);
+static int bridge_ioctl_gifsstp64(struct bridge_softc *, void *);
+static int bridge_ioctl_sproto(struct bridge_softc *, void *);
+static int bridge_ioctl_stxhc(struct bridge_softc *, void *);
+static int bridge_ioctl_purge(struct bridge_softc *sc, void *);
+static int bridge_ioctl_gfilt(struct bridge_softc *, void *);
+static int bridge_ioctl_sfilt(struct bridge_softc *, void *);
+static int bridge_ioctl_ghostfilter(struct bridge_softc *, void *);
+static int bridge_ioctl_shostfilter(struct bridge_softc *, void *);
#ifdef PFIL_HOOKS
-static int bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *,
- int);
-static int bridge_ip_checkbasic(struct mbuf **);
+static int bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *,
+ int);
+static int bridge_ip_checkbasic(struct mbuf **);
#ifdef INET6
-static int bridge_ip6_checkbasic(struct mbuf **);
+static int bridge_ip6_checkbasic(struct mbuf **);
#endif /* INET6 */
-static int bridge_fragment(struct ifnet *, struct mbuf *,
- struct ether_header *, int, struct llc *);
+static int bridge_fragment(struct ifnet *, struct mbuf *,
+ struct ether_header *, int, struct llc *);
#endif /* PFIL_HOOKS */
static errno_t bridge_set_bpf_tap(ifnet_t, bpf_tap_mode, bpf_packet_func);
static void bridge_cleanup_delayed_call(struct bridge_delayed_call *);
static int bridge_host_filter(struct bridge_iflist *, struct mbuf *);
-#define m_copypacket(m, how) m_copym(m, 0, M_COPYALL, how)
+#define m_copypacket(m, how) m_copym(m, 0, M_COPYALL, how)
/* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */
-#define VLANTAGOF(_m) 0
+#define VLANTAGOF(_m) 0
u_int8_t bstp_etheraddr[ETHER_ADDR_LEN] =
- { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
+{ 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
static u_int8_t ethernulladdr[ETHER_ADDR_LEN] =
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
#if BRIDGESTP
static struct bstp_cb_ops bridge_ops = {
#endif /* BRIDGESTP */
SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, IFT_BRIDGE, bridge, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
- "Bridge");
+SYSCTL_NODE(_net_link, IFT_BRIDGE, bridge, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+ "Bridge");
static int bridge_inherit_mac = 0; /* share MAC with first bridge member */
SYSCTL_INT(_net_link_bridge, OID_AUTO, inherit_mac,
- CTLFLAG_RW|CTLFLAG_LOCKED,
- &bridge_inherit_mac, 0,
- "Inherit MAC address from the first bridge member");
+ CTLFLAG_RW | CTLFLAG_LOCKED,
+ &bridge_inherit_mac, 0,
+ "Inherit MAC address from the first bridge member");
SYSCTL_INT(_net_link_bridge, OID_AUTO, rtable_prune_period,
- CTLFLAG_RW|CTLFLAG_LOCKED,
- &bridge_rtable_prune_period, 0,
- "Interval between pruning of routing table");
+ CTLFLAG_RW | CTLFLAG_LOCKED,
+ &bridge_rtable_prune_period, 0,
+ "Interval between pruning of routing table");
static unsigned int bridge_rtable_hash_size_max = BRIDGE_RTHASH_SIZE_MAX;
SYSCTL_UINT(_net_link_bridge, OID_AUTO, rtable_hash_size_max,
- CTLFLAG_RW|CTLFLAG_LOCKED,
- &bridge_rtable_hash_size_max, 0,
- "Maximum size of the routing hash table");
+ CTLFLAG_RW | CTLFLAG_LOCKED,
+ &bridge_rtable_hash_size_max, 0,
+ "Maximum size of the routing hash table");
#if BRIDGE_DEBUG_DELAYED_CALLBACK
static int bridge_delayed_callback_delay = 0;
SYSCTL_INT(_net_link_bridge, OID_AUTO, delayed_callback_delay,
- CTLFLAG_RW|CTLFLAG_LOCKED,
- &bridge_delayed_callback_delay, 0,
- "Delay before calling delayed function");
+ CTLFLAG_RW | CTLFLAG_LOCKED,
+ &bridge_delayed_callback_delay, 0,
+ "Delay before calling delayed function");
#endif
SYSCTL_STRUCT(_net_link_bridge, OID_AUTO,
- hostfilterstats, CTLFLAG_RD | CTLFLAG_LOCKED,
- &bridge_hostfilter_stats, bridge_hostfilter_stats, "");
+ hostfilterstats, CTLFLAG_RD | CTLFLAG_LOCKED,
+ &bridge_hostfilter_stats, bridge_hostfilter_stats, "");
#if defined(PFIL_HOOKS)
static int pfil_onlyip = 1; /* only pass IP[46] packets when pfil is enabled */
static int pfil_ipfw = 0; /* layer2 filter with ipfw */
static int pfil_ipfw_arp = 0; /* layer2 filter with ipfw */
static int pfil_local_phys = 0; /* run pfil hooks on the physical interface */
- /* for locally destined packets */
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_onlyip, CTLFLAG_RW|CTLFLAG_LOCKED,
- &pfil_onlyip, 0, "Only pass IP packets when pfil is enabled");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, ipfw_arp, CTLFLAG_RW|CTLFLAG_LOCKED,
- &pfil_ipfw_arp, 0, "Filter ARP packets through IPFW layer2");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_bridge, CTLFLAG_RW|CTLFLAG_LOCKED,
- &pfil_bridge, 0, "Packet filter on the bridge interface");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_member, CTLFLAG_RW|CTLFLAG_LOCKED,
- &pfil_member, 0, "Packet filter on the member interface");
+ /* for locally destined packets */
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_onlyip, CTLFLAG_RW | CTLFLAG_LOCKED,
+ &pfil_onlyip, 0, "Only pass IP packets when pfil is enabled");
+SYSCTL_INT(_net_link_bridge, OID_AUTO, ipfw_arp, CTLFLAG_RW | CTLFLAG_LOCKED,
+ &pfil_ipfw_arp, 0, "Filter ARP packets through IPFW layer2");
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_bridge, CTLFLAG_RW | CTLFLAG_LOCKED,
+ &pfil_bridge, 0, "Packet filter on the bridge interface");
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_member, CTLFLAG_RW | CTLFLAG_LOCKED,
+ &pfil_member, 0, "Packet filter on the member interface");
SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_local_phys,
- CTLFLAG_RW|CTLFLAG_LOCKED, &pfil_local_phys, 0,
- "Packet filter on the physical interface for locally destined packets");
+ CTLFLAG_RW | CTLFLAG_LOCKED, &pfil_local_phys, 0,
+ "Packet filter on the physical interface for locally destined packets");
#endif /* PFIL_HOOKS */
#if BRIDGESTP
static int log_stp = 0; /* log STP state changes */
SYSCTL_INT(_net_link_bridge, OID_AUTO, log_stp, CTLFLAG_RW,
- &log_stp, 0, "Log STP state changes");
+ &log_stp, 0, "Log STP state changes");
#endif /* BRIDGESTP */
struct bridge_control {
- int (*bc_func)(struct bridge_softc *, void *);
- unsigned int bc_argsize;
- unsigned int bc_flags;
+ int (*bc_func)(struct bridge_softc *, void *);
+ unsigned int bc_argsize;
+ unsigned int bc_flags;
};
-#define BC_F_COPYIN 0x01 /* copy arguments in */
-#define BC_F_COPYOUT 0x02 /* copy arguments out */
-#define BC_F_SUSER 0x04 /* do super-user check */
+#define BC_F_COPYIN 0x01 /* copy arguments in */
+#define BC_F_COPYOUT 0x02 /* copy arguments out */
+#define BC_F_SUSER 0x04 /* do super-user check */
static const struct bridge_control bridge_control_table32[] = {
- { bridge_ioctl_add, sizeof (struct ifbreq), /* 0 */
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_del, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_add, .bc_argsize = sizeof(struct ifbreq), /* 0 */
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+ { .bc_func = bridge_ioctl_del, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gifflags, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_COPYOUT },
- { bridge_ioctl_sifflags, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gifflags, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sifflags, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_scache, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_gcache, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_scache, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gcache, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
- { bridge_ioctl_gifs32, sizeof (struct ifbifconf32),
- BC_F_COPYIN|BC_F_COPYOUT },
- { bridge_ioctl_rts32, sizeof (struct ifbaconf32),
- BC_F_COPYIN|BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_gifs32, .bc_argsize = sizeof(struct ifbifconf32),
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_rts32, .bc_argsize = sizeof(struct ifbaconf32),
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
- { bridge_ioctl_saddr32, sizeof (struct ifbareq32),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_saddr32, .bc_argsize = sizeof(struct ifbareq32),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_sto, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_gto, sizeof (struct ifbrparam), /* 10 */
- BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sto, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gto, .bc_argsize = sizeof(struct ifbrparam), /* 10 */
+ .bc_flags = BC_F_COPYOUT },
- { bridge_ioctl_daddr32, sizeof (struct ifbareq32),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_daddr32, .bc_argsize = sizeof(struct ifbareq32),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_flush, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_flush, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gpri, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_spri, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gpri, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_spri, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_ght, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sht, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_ght, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sht, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gfd, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sfd, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gfd, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sfd, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gma, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sma, sizeof (struct ifbrparam), /* 20 */
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gma, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sma, .bc_argsize = sizeof(struct ifbrparam), /* 20 */
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_sifprio, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_sifprio, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_sifcost, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_sifcost, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gfilt, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sfilt, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gfilt, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sfilt, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_purge, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_purge, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_addspan, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_delspan, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_addspan, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+ { .bc_func = bridge_ioctl_delspan, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gbparam32, sizeof (struct ifbropreq32),
- BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_gbparam32, .bc_argsize = sizeof(struct ifbropreq32),
+ .bc_flags = BC_F_COPYOUT },
- { bridge_ioctl_grte, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_grte, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
- { bridge_ioctl_gifsstp32, sizeof (struct ifbpstpconf32), /* 30 */
- BC_F_COPYIN|BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_gifsstp32, .bc_argsize = sizeof(struct ifbpstpconf32), /* 30 */
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
- { bridge_ioctl_sproto, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_sproto, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_stxhc, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_stxhc, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_sifmaxaddr, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_sifmaxaddr, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_ghostfilter, sizeof (struct ifbrhostfilter),
- BC_F_COPYIN|BC_F_COPYOUT },
- { bridge_ioctl_shostfilter, sizeof (struct ifbrhostfilter),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_ghostfilter, .bc_argsize = sizeof(struct ifbrhostfilter),
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_shostfilter, .bc_argsize = sizeof(struct ifbrhostfilter),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
};
static const struct bridge_control bridge_control_table64[] = {
- { bridge_ioctl_add, sizeof (struct ifbreq), /* 0 */
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_del, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_add, .bc_argsize = sizeof(struct ifbreq), /* 0 */
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+ { .bc_func = bridge_ioctl_del, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gifflags, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_COPYOUT },
- { bridge_ioctl_sifflags, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gifflags, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sifflags, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_scache, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_gcache, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_scache, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gcache, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
- { bridge_ioctl_gifs64, sizeof (struct ifbifconf64),
- BC_F_COPYIN|BC_F_COPYOUT },
- { bridge_ioctl_rts64, sizeof (struct ifbaconf64),
- BC_F_COPYIN|BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_gifs64, .bc_argsize = sizeof(struct ifbifconf64),
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_rts64, .bc_argsize = sizeof(struct ifbaconf64),
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
- { bridge_ioctl_saddr64, sizeof (struct ifbareq64),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_saddr64, .bc_argsize = sizeof(struct ifbareq64),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_sto, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_gto, sizeof (struct ifbrparam), /* 10 */
- BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sto, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gto, .bc_argsize = sizeof(struct ifbrparam), /* 10 */
+ .bc_flags = BC_F_COPYOUT },
- { bridge_ioctl_daddr64, sizeof (struct ifbareq64),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_daddr64, .bc_argsize = sizeof(struct ifbareq64),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_flush, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_flush, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gpri, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_spri, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gpri, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_spri, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_ght, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sht, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_ght, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sht, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gfd, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sfd, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gfd, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sfd, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gma, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sma, sizeof (struct ifbrparam), /* 20 */
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gma, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sma, .bc_argsize = sizeof(struct ifbrparam), /* 20 */
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_sifprio, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_sifprio, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_sifcost, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_sifcost, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gfilt, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sfilt, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_gfilt, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_sfilt, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_purge, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_purge, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_addspan, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_delspan, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_addspan, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+ { .bc_func = bridge_ioctl_delspan, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_gbparam64, sizeof (struct ifbropreq64),
- BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_gbparam64, .bc_argsize = sizeof(struct ifbropreq64),
+ .bc_flags = BC_F_COPYOUT },
- { bridge_ioctl_grte, sizeof (struct ifbrparam),
- BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_grte, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYOUT },
- { bridge_ioctl_gifsstp64, sizeof (struct ifbpstpconf64), /* 30 */
- BC_F_COPYIN|BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_gifsstp64, .bc_argsize = sizeof(struct ifbpstpconf64), /* 30 */
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
- { bridge_ioctl_sproto, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_sproto, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_stxhc, sizeof (struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_stxhc, .bc_argsize = sizeof(struct ifbrparam),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_sifmaxaddr, sizeof (struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_sifmaxaddr, .bc_argsize = sizeof(struct ifbreq),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
- { bridge_ioctl_ghostfilter, sizeof (struct ifbrhostfilter),
- BC_F_COPYIN|BC_F_COPYOUT },
- { bridge_ioctl_shostfilter, sizeof (struct ifbrhostfilter),
- BC_F_COPYIN|BC_F_SUSER },
+ { .bc_func = bridge_ioctl_ghostfilter, .bc_argsize = sizeof(struct ifbrhostfilter),
+ .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+ { .bc_func = bridge_ioctl_shostfilter, .bc_argsize = sizeof(struct ifbrhostfilter),
+ .bc_flags = BC_F_COPYIN | BC_F_SUSER },
};
static const unsigned int bridge_control_table_size =
- sizeof (bridge_control_table32) / sizeof (bridge_control_table32[0]);
+ sizeof(bridge_control_table32) / sizeof(bridge_control_table32[0]);
static LIST_HEAD(, bridge_softc) bridge_list =
- LIST_HEAD_INITIALIZER(bridge_list);
+ LIST_HEAD_INITIALIZER(bridge_list);
static lck_grp_t *bridge_lock_grp = NULL;
static lck_attr_t *bridge_lock_attr = NULL;
-static if_clone_t bridge_cloner = NULL;
+#define BRIDGENAME "bridge"
+#define BRIDGES_MAX IF_MAXUNIT
+#define BRIDGE_ZONE_MAX_ELEM MIN(IFNETS_MAX, BRIDGES_MAX)
+
+static struct if_clone bridge_cloner =
+ IF_CLONE_INITIALIZER(BRIDGENAME, bridge_clone_create, bridge_clone_destroy,
+ 0, BRIDGES_MAX, BRIDGE_ZONE_MAX_ELEM, sizeof(struct bridge_softc));
static int if_bridge_txstart = 0;
SYSCTL_INT(_net_link_bridge, OID_AUTO, txstart, CTLFLAG_RW | CTLFLAG_LOCKED,
- &if_bridge_txstart, 0, "Bridge interface uses TXSTART model");
+ &if_bridge_txstart, 0, "Bridge interface uses TXSTART model");
#if BRIDGE_DEBUG
static int if_bridge_debug = 0;
SYSCTL_INT(_net_link_bridge, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_LOCKED,
- &if_bridge_debug, 0, "Bridge debug");
+ &if_bridge_debug, 0, "Bridge debug");
static void printf_ether_header(struct ether_header *);
static void printf_mbuf_data(mbuf_t, size_t, size_t);
static void printf_mbuf_pkthdr(mbuf_t, const char *, const char *);
static void printf_mbuf(mbuf_t, const char *, const char *);
-static void link_print(struct sockaddr_dl *);
+static void link_print(struct bridge_softc * sc);
static void bridge_lock(struct bridge_softc *);
static void bridge_unlock(struct bridge_softc *);
_BRIDGE_LOCK(sc);
sc->lock_lr[sc->next_lock_lr] = lr_saved;
- sc->next_lock_lr = (sc->next_lock_lr+1) % SO_LCKDBG_MAX;
+ sc->next_lock_lr = (sc->next_lock_lr + 1) % SO_LCKDBG_MAX;
}
static void
BRIDGE_LOCK_ASSERT_HELD(sc);
sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
- sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
+ sc->next_unlock_lr = (sc->next_unlock_lr + 1) % SO_LCKDBG_MAX;
_BRIDGE_UNLOCK(sc);
}
BRIDGE_LOCK_ASSERT_HELD(sc);
- if (sc->sc_iflist_xcnt > 0)
+ if (sc->sc_iflist_xcnt > 0) {
error = EBUSY;
- else
+ } else {
sc->sc_iflist_ref++;
+ }
sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
- sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
+ sc->next_unlock_lr = (sc->next_unlock_lr + 1) % SO_LCKDBG_MAX;
_BRIDGE_UNLOCK(sc);
- return (error);
+ return error;
}
static void
_BRIDGE_LOCK(sc);
sc->lock_lr[sc->next_lock_lr] = lr_saved;
- sc->next_lock_lr = (sc->next_lock_lr+1) % SO_LCKDBG_MAX;
+ sc->next_lock_lr = (sc->next_lock_lr + 1) % SO_LCKDBG_MAX;
sc->sc_iflist_ref--;
sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
- sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
+ sc->next_unlock_lr = (sc->next_unlock_lr + 1) % SO_LCKDBG_MAX;
if ((sc->sc_iflist_xcnt > 0) && (sc->sc_iflist_ref == 0)) {
_BRIDGE_UNLOCK(sc);
wakeup(&sc->sc_cv);
- } else
+ } else {
_BRIDGE_UNLOCK(sc);
+ }
}
static void
sc->sc_iflist_xcnt++;
while (sc->sc_iflist_ref > 0) {
sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
- sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
+ sc->next_unlock_lr = (sc->next_unlock_lr + 1) % SO_LCKDBG_MAX;
msleep(&sc->sc_cv, &sc->sc_mtx, PZERO, "BRIDGE_XLOCK", NULL);
sc->lock_lr[sc->next_lock_lr] = lr_saved;
- sc->next_lock_lr = (sc->next_lock_lr+1) % SO_LCKDBG_MAX;
+ sc->next_lock_lr = (sc->next_lock_lr + 1) % SO_LCKDBG_MAX;
}
}
void
printf_mbuf_pkthdr(mbuf_t m, const char *prefix, const char *suffix)
{
- if (m)
+ if (m) {
printf("%spktlen: %u rcvif: 0x%llx header: 0x%llx "
"nextpkt: 0x%llx%s",
prefix ? prefix : "", (unsigned int)mbuf_pkthdr_len(m),
(uint64_t)VM_KERNEL_ADDRPERM(mbuf_pkthdr_header(m)),
(uint64_t)VM_KERNEL_ADDRPERM(mbuf_nextpkt(m)),
suffix ? suffix : "");
- else
+ } else {
printf("%s<NULL>%s\n", prefix, suffix);
+ }
}
void
(uint64_t)VM_KERNEL_ADDRPERM(mbuf_datastart(m)),
(uint64_t)VM_KERNEL_ADDRPERM(mbuf_next(m)),
!suffix || (mbuf_flags(m) & MBUF_PKTHDR) ? "" : suffix);
- if ((mbuf_flags(m) & MBUF_PKTHDR))
+ if ((mbuf_flags(m) & MBUF_PKTHDR)) {
printf_mbuf_pkthdr(m, " ", suffix);
- } else
+ }
+ } else {
printf("%s<NULL>%s\n", prefix, suffix);
+ }
}
void
printf_mbuf_data(mbuf_t m, size_t offset, size_t len)
{
- mbuf_t n;
- size_t i, j;
- size_t pktlen, mlen, maxlen;
- unsigned char *ptr;
+ mbuf_t n;
+ size_t i, j;
+ size_t pktlen, mlen, maxlen;
+ unsigned char *ptr;
pktlen = mbuf_pkthdr_len(m);
- if (offset > pktlen)
+ if (offset > pktlen) {
return;
+ }
maxlen = (pktlen - offset > len) ? len : pktlen - offset;
n = m;
for (i = 0, j = 0; i < maxlen; i++, j++) {
if (j >= mlen) {
n = mbuf_next(n);
- if (n == 0)
+ if (n == 0) {
break;
+ }
ptr = mbuf_data(n);
mlen = mbuf_len(n);
j = 0;
}
static void
-link_print(struct sockaddr_dl *dl_p)
+link_print(struct bridge_softc * sc)
{
int i;
+ uint32_t sdl_buffer[offsetof(struct sockaddr_dl, sdl_data) +
+ IFNAMSIZ + ETHER_ADDR_LEN];
+ struct sockaddr_dl *sdl = (struct sockaddr_dl *)sdl_buffer;
+
+ memset(sdl, 0, sizeof(sdl_buffer));
+ sdl->sdl_family = AF_LINK;
+ sdl->sdl_nlen = strlen(sc->sc_if_xname);
+ sdl->sdl_alen = ETHER_ADDR_LEN;
+ sdl->sdl_len = offsetof(struct sockaddr_dl, sdl_data);
+ memcpy(sdl->sdl_data, sc->sc_if_xname, sdl->sdl_nlen);
+ memcpy(LLADDR(sdl), sc->sc_defaddr, ETHER_ADDR_LEN);
#if 1
printf("sdl len %d index %d family %d type 0x%x nlen %d alen %d"
- " slen %d addr ", dl_p->sdl_len, dl_p->sdl_index,
- dl_p->sdl_family, dl_p->sdl_type, dl_p->sdl_nlen,
- dl_p->sdl_alen, dl_p->sdl_slen);
+ " slen %d addr ", sdl->sdl_len, sdl->sdl_index,
+ sdl->sdl_family, sdl->sdl_type, sdl->sdl_nlen,
+ sdl->sdl_alen, sdl->sdl_slen);
#endif
- for (i = 0; i < dl_p->sdl_alen; i++)
- printf("%s%x", i ? ":" : "", (CONST_LLADDR(dl_p))[i]);
+ for (i = 0; i < sdl->sdl_alen; i++) {
+ printf("%s%x", i ? ":" : "", (CONST_LLADDR(sdl))[i]);
+ }
printf("\n");
}
#pragma unused(n)
int error;
lck_grp_attr_t *lck_grp_attr = NULL;
- struct ifnet_clone_params ifnet_clone_params;
- bridge_rtnode_pool = zinit(sizeof (struct bridge_rtnode),
- 1024 * sizeof (struct bridge_rtnode), 0, "bridge_rtnode");
+ bridge_rtnode_pool = zinit(sizeof(struct bridge_rtnode),
+ 1024 * sizeof(struct bridge_rtnode), 0, "bridge_rtnode");
zone_change(bridge_rtnode_pool, Z_CALLERACCT, FALSE);
lck_grp_attr = lck_grp_attr_alloc_init();
bstp_sys_init();
#endif /* BRIDGESTP */
- ifnet_clone_params.ifc_name = "bridge";
- ifnet_clone_params.ifc_create = bridge_clone_create;
- ifnet_clone_params.ifc_destroy = bridge_clone_destroy;
-
- error = ifnet_clone_attach(&ifnet_clone_params, &bridge_cloner);
- if (error != 0)
+ error = if_clone_attach(&bridge_cloner);
+ if (error != 0) {
printf("%s: ifnet_clone_attach failed %d\n", __func__, error);
+ }
- return (error);
+ return error;
}
#if defined(PFIL_HOOKS)
}
}
- return (error);
+ return error;
}
-SYSCTL_PROC(_net_link_bridge, OID_AUTO, ipfw, CTLTYPE_INT|CTLFLAG_RW,
- &pfil_ipfw, 0, &sysctl_pfil_ipfw, "I", "Layer2 filter with IPFW");
+SYSCTL_PROC(_net_link_bridge, OID_AUTO, ipfw, CTLTYPE_INT | CTLFLAG_RW,
+ &pfil_ipfw, 0, &sysctl_pfil_ipfw, "I", "Layer2 filter with IPFW");
#endif /* PFIL_HOOKS */
+static errno_t
+bridge_ifnet_set_attrs(struct ifnet * ifp)
+{
+ errno_t error;
+
+ error = ifnet_set_mtu(ifp, ETHERMTU);
+ if (error != 0) {
+ printf("%s: ifnet_set_mtu failed %d\n", __func__, error);
+ goto done;
+ }
+ error = ifnet_set_addrlen(ifp, ETHER_ADDR_LEN);
+ if (error != 0) {
+ printf("%s: ifnet_set_addrlen failed %d\n", __func__, error);
+ goto done;
+ }
+ error = ifnet_set_hdrlen(ifp, ETHER_HDR_LEN);
+ if (error != 0) {
+ printf("%s: ifnet_set_hdrlen failed %d\n", __func__, error);
+ goto done;
+ }
+ error = ifnet_set_flags(ifp,
+ IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST,
+ 0xffff);
+
+ if (error != 0) {
+ printf("%s: ifnet_set_flags failed %d\n", __func__, error);
+ goto done;
+ }
+done:
+ return error;
+}
+
/*
* bridge_clone_create:
*
{
#pragma unused(params)
struct ifnet *ifp = NULL;
- struct bridge_softc *sc, *sc2;
+ struct bridge_softc *sc = NULL;
+ struct bridge_softc *sc2 = NULL;
struct ifnet_init_eparams init_params;
errno_t error = 0;
- uint32_t sdl_buffer[offsetof(struct sockaddr_dl, sdl_data) +
- IFNAMSIZ + ETHER_ADDR_LEN];
- struct sockaddr_dl *sdl = (struct sockaddr_dl *)sdl_buffer;
uint8_t eth_hostid[ETHER_ADDR_LEN];
int fb, retry, has_hostid;
- sc = _MALLOC(sizeof (*sc), M_DEVBUF, M_WAITOK | M_ZERO);
+ sc = if_clone_softc_allocate(&bridge_cloner);
+ if (sc == NULL) {
+ error = ENOMEM;
+ goto done;
+ }
lck_mtx_init(&sc->sc_mtx, bridge_lock_grp, bridge_lock_attr);
sc->sc_brtmax = BRIDGE_RTABLE_MAX;
sc->sc_filter_flags &= ~IFBF_FILT_USEIPF;
#endif
+ TAILQ_INIT(&sc->sc_iflist);
+
+ /* use the interface name as the unique id for ifp recycle */
+ snprintf(sc->sc_if_xname, sizeof(sc->sc_if_xname), "%s%d",
+ ifc->ifc_name, unit);
+ bzero(&init_params, sizeof(init_params));
+ init_params.ver = IFNET_INIT_CURRENT_VERSION;
+ init_params.len = sizeof(init_params);
/* Initialize our routing table. */
error = bridge_rtable_init(sc);
if (error != 0) {
- printf("%s: bridge_rtable_init failed %d\n", __func__, error);
+ printf("%s: bridge_rtable_init failed %d\n",
+ __func__, error);
goto done;
}
-
- TAILQ_INIT(&sc->sc_iflist);
TAILQ_INIT(&sc->sc_spanlist);
-
- /* use the interface name as the unique id for ifp recycle */
- snprintf(sc->sc_if_xname, sizeof (sc->sc_if_xname), "%s%d",
- ifc->ifc_name, unit);
- bzero(&init_params, sizeof (init_params));
- init_params.ver = IFNET_INIT_CURRENT_VERSION;
- init_params.len = sizeof (init_params);
if (if_bridge_txstart) {
- init_params.start = bridge_start;
+ init_params.start = bridge_start;
} else {
- init_params.flags = IFNET_INIT_LEGACY;
- init_params.output = bridge_output;
- }
- init_params.uniqueid = sc->sc_if_xname;
- init_params.uniqueid_len = strlen(sc->sc_if_xname);
- init_params.sndq_maxlen = IFQ_MAXLEN;
- init_params.name = ifc->ifc_name;
- init_params.unit = unit;
- init_params.family = IFNET_FAMILY_ETHERNET;
- init_params.type = IFT_BRIDGE;
- init_params.demux = ether_demux;
- init_params.add_proto = ether_add_proto;
- init_params.del_proto = ether_del_proto;
- init_params.check_multi = ether_check_multi;
- init_params.framer_extended = ether_frameout_extended;
- init_params.softc = sc;
- init_params.ioctl = bridge_ioctl;
- init_params.set_bpf_tap = bridge_set_bpf_tap;
- init_params.detach = bridge_detach;
- init_params.broadcast_addr = etherbroadcastaddr;
- init_params.broadcast_len = ETHER_ADDR_LEN;
+ init_params.flags = IFNET_INIT_LEGACY;
+ init_params.output = bridge_output;
+ }
+ init_params.set_bpf_tap = bridge_set_bpf_tap;
+ init_params.uniqueid = sc->sc_if_xname;
+ init_params.uniqueid_len = strlen(sc->sc_if_xname);
+ init_params.sndq_maxlen = IFQ_MAXLEN;
+ init_params.name = ifc->ifc_name;
+ init_params.unit = unit;
+ init_params.family = IFNET_FAMILY_ETHERNET;
+ init_params.type = IFT_BRIDGE;
+ init_params.demux = ether_demux;
+ init_params.add_proto = ether_add_proto;
+ init_params.del_proto = ether_del_proto;
+ init_params.check_multi = ether_check_multi;
+ init_params.framer_extended = ether_frameout_extended;
+ init_params.softc = sc;
+ init_params.ioctl = bridge_ioctl;
+ init_params.detach = bridge_detach;
+ init_params.broadcast_addr = etherbroadcastaddr;
+ init_params.broadcast_len = ETHER_ADDR_LEN;
+
error = ifnet_allocate_extended(&init_params, &ifp);
if (error != 0) {
- printf("%s: ifnet_allocate failed %d\n", __func__, error);
+ printf("%s: ifnet_allocate failed %d\n",
+ __func__, error);
goto done;
}
sc->sc_ifp = ifp;
-
- error = ifnet_set_mtu(ifp, ETHERMTU);
- if (error != 0) {
- printf("%s: ifnet_set_mtu failed %d\n", __func__, error);
- goto done;
- }
- error = ifnet_set_addrlen(ifp, ETHER_ADDR_LEN);
- if (error != 0) {
- printf("%s: ifnet_set_addrlen failed %d\n", __func__, error);
- goto done;
- }
- error = ifnet_set_hdrlen(ifp, ETHER_HDR_LEN);
- if (error != 0) {
- printf("%s: ifnet_set_hdrlen failed %d\n", __func__, error);
- goto done;
- }
- error = ifnet_set_flags(ifp,
- IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST,
- 0xffff);
+ error = bridge_ifnet_set_attrs(ifp);
if (error != 0) {
- printf("%s: ifnet_set_flags failed %d\n", __func__, error);
+ printf("%s: bridge_ifnet_set_attrs failed %d\n",
+ __func__, error);
goto done;
}
-
/*
* Generate an ethernet address with a locally administered address.
*
* Since we are using random ethernet addresses for the bridge, it is
* possible that we might have address collisions, so make sure that
* this hardware address isn't already in use on another bridge.
- * The first try uses the "hostid" and falls back to read_random();
+ * The first try uses the "hostid" and falls back to read_frandom();
* for "hostid", we use the MAC address of the first-encountered
* Ethernet-type interface that is currently configured.
*/
fb = 0;
has_hostid = (uuid_get_ethernet(ð_hostid[0]) == 0);
- for (retry = 1; retry != 0; ) {
+ for (retry = 1; retry != 0;) {
if (fb || has_hostid == 0) {
- read_random(&sc->sc_defaddr, ETHER_ADDR_LEN);
+ read_frandom(&sc->sc_defaddr, ETHER_ADDR_LEN);
sc->sc_defaddr[0] &= ~1; /* clear multicast bit */
sc->sc_defaddr[0] |= 2; /* set the LAA bit */
} else {
ETHER_ADDR_LEN);
sc->sc_defaddr[0] &= ~1; /* clear multicast bit */
sc->sc_defaddr[0] |= 2; /* set the LAA bit */
- sc->sc_defaddr[3] = /* stir it up a bit */
+ sc->sc_defaddr[3] = /* stir it up a bit */
((sc->sc_defaddr[3] & 0x0f) << 4) |
((sc->sc_defaddr[3] & 0xf0) >> 4);
/*
lck_mtx_lock(&bridge_list_mtx);
LIST_FOREACH(sc2, &bridge_list, sc_list) {
if (memcmp(sc->sc_defaddr,
- IF_LLADDR(sc2->sc_ifp), ETHER_ADDR_LEN) == 0)
+ IF_LLADDR(sc2->sc_ifp), ETHER_ADDR_LEN) == 0) {
retry = 1;
+ }
}
lck_mtx_unlock(&bridge_list_mtx);
}
- memset(sdl, 0, sizeof (sdl_buffer));
- sdl->sdl_family = AF_LINK;
- sdl->sdl_nlen = strlen(sc->sc_if_xname);
- sdl->sdl_alen = ETHER_ADDR_LEN;
- sdl->sdl_len = offsetof(struct sockaddr_dl, sdl_data);
- memcpy(sdl->sdl_data, sc->sc_if_xname, sdl->sdl_nlen);
- memcpy(LLADDR(sdl), sc->sc_defaddr, ETHER_ADDR_LEN);
-
sc->sc_flags &= ~SCF_MEDIA_ACTIVE;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
- link_print(sdl);
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+ link_print(sc);
+ }
#endif
-
error = ifnet_attach(ifp, NULL);
if (error != 0) {
printf("%s: ifnet_attach failed %d\n", __func__, error);
ifnet_set_offload(ifp,
IFNET_CSUM_IP | IFNET_CSUM_TCP | IFNET_CSUM_UDP |
IFNET_CSUM_TCPIPV6 | IFNET_CSUM_UDPIPV6 | IFNET_MULTIPAGES);
-
error = bridge_set_tso(sc);
if (error != 0) {
- printf("%s: bridge_set_tso failed %d\n", __func__, error);
+ printf("%s: bridge_set_tso failed %d\n",
+ __func__, error);
goto done;
}
-
#if BRIDGESTP
bstp_attach(&sc->sc_stp, &bridge_ops);
#endif /* BRIDGESTP */
lck_mtx_unlock(&bridge_list_mtx);
/* attach as ethernet */
- error = bpf_attach(ifp, DLT_EN10MB, sizeof (struct ether_header),
+ error = bpf_attach(ifp, DLT_EN10MB, sizeof(struct ether_header),
NULL, NULL);
done:
if (error != 0) {
printf("%s failed error %d\n", __func__, error);
- /* Cleanup TBD */
+ /* TBD: Clean up: sc, sc_rthash etc */
}
- return (error);
+ return error;
}
/*
BRIDGE_LOCK(sc);
if ((sc->sc_flags & SCF_DETACHING)) {
BRIDGE_UNLOCK(sc);
- return (0);
+ return 0;
}
sc->sc_flags |= SCF_DETACHING;
printf("%s: ifnet_set_flags failed %d\n", __func__, error);
}
- while ((bif = TAILQ_FIRST(&sc->sc_iflist)) != NULL)
+ while ((bif = TAILQ_FIRST(&sc->sc_iflist)) != NULL) {
bridge_delete_member(sc, bif, 0);
+ }
while ((bif = TAILQ_FIRST(&sc->sc_spanlist)) != NULL) {
bridge_delete_span(sc, bif);
}
-
BRIDGE_UNLOCK(sc);
error = ifnet_detach(ifp);
if (error != 0) {
- panic("bridge_clone_destroy: ifnet_detach(%p) failed %d\n",
- ifp, error);
- if ((sc = (struct bridge_softc *)ifnet_softc(ifp)) != NULL) {
- BRIDGE_LOCK(sc);
- sc->sc_flags &= ~SCF_DETACHING;
- BRIDGE_UNLOCK(sc);
- }
- return (0);
- }
-
- return (0);
-}
-
-#define DRVSPEC do { \
- if (ifd->ifd_cmd >= bridge_control_table_size) { \
- error = EINVAL; \
- break; \
- } \
- bc = &bridge_control_table[ifd->ifd_cmd]; \
- \
- if (cmd == SIOCGDRVSPEC && \
- (bc->bc_flags & BC_F_COPYOUT) == 0) { \
- error = EINVAL; \
- break; \
- } else if (cmd == SIOCSDRVSPEC && \
- (bc->bc_flags & BC_F_COPYOUT) != 0) { \
- error = EINVAL; \
- break; \
- } \
- \
- if (bc->bc_flags & BC_F_SUSER) { \
- error = kauth_authorize_generic(kauth_cred_get(), \
- KAUTH_GENERIC_ISSUSER); \
- if (error) \
- break; \
- } \
- \
- if (ifd->ifd_len != bc->bc_argsize || \
- ifd->ifd_len > sizeof (args)) { \
- error = EINVAL; \
- break; \
- } \
- \
- bzero(&args, sizeof (args)); \
- if (bc->bc_flags & BC_F_COPYIN) { \
- error = copyin(ifd->ifd_data, &args, ifd->ifd_len); \
- if (error) \
- break; \
- } \
- \
- BRIDGE_LOCK(sc); \
- error = (*bc->bc_func)(sc, &args); \
- BRIDGE_UNLOCK(sc); \
- if (error) \
- break; \
- \
- if (bc->bc_flags & BC_F_COPYOUT) \
- error = copyout(&args, ifd->ifd_data, ifd->ifd_len); \
+ panic("%s: ifnet_detach(%p) failed %d\n",
+ __func__, ifp, error);
+ }
+ return 0;
+}
+
+#define DRVSPEC do { \
+ if (ifd->ifd_cmd >= bridge_control_table_size) { \
+ error = EINVAL; \
+ break; \
+ } \
+ bc = &bridge_control_table[ifd->ifd_cmd]; \
+ \
+ if (cmd == SIOCGDRVSPEC && \
+ (bc->bc_flags & BC_F_COPYOUT) == 0) { \
+ error = EINVAL; \
+ break; \
+ } else if (cmd == SIOCSDRVSPEC && \
+ (bc->bc_flags & BC_F_COPYOUT) != 0) { \
+ error = EINVAL; \
+ break; \
+ } \
+ \
+ if (bc->bc_flags & BC_F_SUSER) { \
+ error = kauth_authorize_generic(kauth_cred_get(), \
+ KAUTH_GENERIC_ISSUSER); \
+ if (error) \
+ break; \
+ } \
+ \
+ if (ifd->ifd_len != bc->bc_argsize || \
+ ifd->ifd_len > sizeof (args)) { \
+ error = EINVAL; \
+ break; \
+ } \
+ \
+ bzero(&args, sizeof (args)); \
+ if (bc->bc_flags & BC_F_COPYIN) { \
+ error = copyin(ifd->ifd_data, &args, ifd->ifd_len); \
+ if (error) \
+ break; \
+ } \
+ \
+ BRIDGE_LOCK(sc); \
+ error = (*bc->bc_func)(sc, &args); \
+ BRIDGE_UNLOCK(sc); \
+ if (error) \
+ break; \
+ \
+ if (bc->bc_flags & BC_F_COPYOUT) \
+ error = copyout(&args, ifd->ifd_data, ifd->ifd_len); \
} while (0)
/*
BRIDGE_LOCK_ASSERT_NOTHELD(sc);
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_IOCTL)
+ if (if_bridge_debug & BR_DBGF_IOCTL) {
printf("%s: ifp %s cmd 0x%08lx (%c%c [%lu] %c %lu)\n",
__func__, ifp->if_xname, cmd, (cmd & IOC_IN) ? 'I' : ' ',
(cmd & IOC_OUT) ? 'O' : ' ', IOCPARM_LEN(cmd),
(char)IOCGROUP(cmd), cmd & 0xff);
+ }
#endif /* BRIDGE_DEBUG */
switch (cmd) {
-
case SIOCSIFADDR:
case SIOCAIFADDR:
ifnet_set_flags(ifp, IFF_UP, IFF_UP);
if (user_addr != USER_ADDR_NULL) {
error = copyout(&ifmr->ifm_current, user_addr,
- sizeof (int));
+ sizeof(int));
}
break;
}
case SIOCSIFLLADDR:
error = ifnet_set_lladdr(ifp, ifr->ifr_addr.sa_data,
ifr->ifr_addr.sa_len);
- if (error != 0)
+ if (error != 0) {
printf("%s: SIOCSIFLLADDR error %d\n", ifp->if_xname,
error);
+ }
break;
case SIOCSIFMTU:
break;
}
}
- if (!error)
+ if (!error) {
sc->sc_ifp->if_mtu = ifr->ifr_mtu;
+ }
BRIDGE_UNLOCK(sc);
break;
default:
error = ether_ioctl(ifp, cmd, data);
#if BRIDGE_DEBUG
- if (error != 0 && error != EOPNOTSUPP)
+ if (error != 0 && error != EOPNOTSUPP) {
printf("%s: ifp %s cmd 0x%08lx "
"(%c%c [%lu] %c %lu) failed error: %d\n",
__func__, ifp->if_xname, cmd,
(cmd & IOC_OUT) ? 'O' : ' ',
IOCPARM_LEN(cmd), (char)IOCGROUP(cmd),
cmd & 0xff, error);
+ }
#endif /* BRIDGE_DEBUG */
break;
}
BRIDGE_LOCK_ASSERT_NOTHELD(sc);
- return (error);
+ return error;
}
#if HAS_IF_CAP
bridge_set_ifcap(sc, bif, enabled);
}
-
}
static void
struct ifreq ifr;
int error;
- bzero(&ifr, sizeof (ifr));
+ bzero(&ifr, sizeof(ifr));
ifr.ifr_reqcap = set;
if (ifp->if_capenable != set) {
IFF_LOCKGIANT(ifp);
error = (*ifp->if_ioctl)(ifp, SIOCSIFCAP, (caddr_t)&ifr);
IFF_UNLOCKGIANT(ifp);
- if (error)
+ if (error) {
printf("%s: %s error setting interface capabilities "
"on %s\n", __func__, sc->sc_ifp->if_xname,
ifp->if_xname);
+ }
}
}
#endif /* HAS_IF_CAP */
TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
ifnet_t ifp = bif->bif_ifp;
- if (ifp == NULL)
+ if (ifp == NULL) {
continue;
+ }
if (offload & IFNET_TSO_IPV4) {
if (ifp->if_hwassist & IFNET_TSO_IPV4) {
- if (tso_v4_mtu > ifp->if_tso_v4_mtu)
+ if (tso_v4_mtu > ifp->if_tso_v4_mtu) {
tso_v4_mtu = ifp->if_tso_v4_mtu;
+ }
} else {
offload &= ~IFNET_TSO_IPV4;
tso_v4_mtu = 0;
}
if (offload & IFNET_TSO_IPV6) {
if (ifp->if_hwassist & IFNET_TSO_IPV6) {
- if (tso_v6_mtu > ifp->if_tso_v6_mtu)
+ if (tso_v6_mtu > ifp->if_tso_v6_mtu) {
tso_v6_mtu = ifp->if_tso_v6_mtu;
+ }
} else {
offload &= ~IFNET_TSO_IPV6;
tso_v6_mtu = 0;
error = ifnet_set_offload(sc->sc_ifp, offload);
if (error != 0) {
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: ifnet_set_offload(%s, 0x%x) "
"failed %d\n", __func__,
sc->sc_ifp->if_xname, offload, error);
+ }
#endif /* BRIDGE_DEBUG */
goto done;
}
* as large as the interface MTU
*/
if (sc->sc_ifp->if_hwassist & IFNET_TSO_IPV4) {
- if (tso_v4_mtu < sc->sc_ifp->if_mtu)
+ if (tso_v4_mtu < sc->sc_ifp->if_mtu) {
tso_v4_mtu = sc->sc_ifp->if_mtu;
+ }
error = ifnet_set_tso_mtu(sc->sc_ifp, AF_INET,
tso_v4_mtu);
if (error != 0) {
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: ifnet_set_tso_mtu(%s, "
"AF_INET, %u) failed %d\n",
__func__, sc->sc_ifp->if_xname,
tso_v4_mtu, error);
+ }
#endif /* BRIDGE_DEBUG */
goto done;
}
}
if (sc->sc_ifp->if_hwassist & IFNET_TSO_IPV6) {
- if (tso_v6_mtu < sc->sc_ifp->if_mtu)
+ if (tso_v6_mtu < sc->sc_ifp->if_mtu) {
tso_v6_mtu = sc->sc_ifp->if_mtu;
+ }
error = ifnet_set_tso_mtu(sc->sc_ifp, AF_INET6,
tso_v6_mtu);
if (error != 0) {
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: ifnet_set_tso_mtu(%s, "
"AF_INET6, %u) failed %d\n",
__func__, sc->sc_ifp->if_xname,
tso_v6_mtu, error);
+ }
#endif /* BRIDGE_DEBUG */
goto done;
}
}
}
done:
- return (error);
+ return error;
}
/*
TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
ifp = bif->bif_ifp;
- if (strcmp(ifp->if_xname, name) == 0)
- return (bif);
+ if (strcmp(ifp->if_xname, name) == 0) {
+ return bif;
+ }
}
- return (NULL);
+ return NULL;
}
/*
BRIDGE_LOCK_ASSERT_HELD(sc);
TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
- if (bif->bif_ifp == member_ifp)
- return (bif);
+ if (bif->bif_ifp == member_ifp) {
+ return bif;
+ }
}
- return (NULL);
+ return NULL;
}
static errno_t
bridge_iff_input(void *cookie, ifnet_t ifp, protocol_family_t protocol,
- mbuf_t *data, char **frame_ptr)
+ mbuf_t *data, char **frame_ptr)
{
#pragma unused(protocol)
errno_t error = 0;
size_t frmlen = 0;
mbuf_t m = *data;
- if ((m->m_flags & M_PROTO1))
+ if ((m->m_flags & M_PROTO1)) {
goto out;
+ }
if (*frame_ptr >= (char *)mbuf_datastart(m) &&
*frame_ptr <= (char *)mbuf_data(m)) {
out:
BRIDGE_LOCK_ASSERT_NOTHELD(sc);
- return (error);
+ return error;
}
-#if BRIDGE_MEMBER_OUT_FILTER
static errno_t
bridge_iff_output(void *cookie, ifnet_t ifp, protocol_family_t protocol,
- mbuf_t *data)
+ mbuf_t *data)
{
#pragma unused(protocol)
errno_t error = 0;
struct bridge_softc *sc = bif->bif_sc;
mbuf_t m = *data;
- if ((m->m_flags & M_PROTO1))
+ if ((m->m_flags & M_PROTO1)) {
goto out;
+ }
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_OUTPPUT) {
+ if (if_bridge_debug & BR_DBGF_OUTPUT) {
printf("%s: %s from %s m 0x%llx data 0x%llx\n", __func__,
sc->sc_ifp->if_xname, ifp->if_xname,
(uint64_t)VM_KERNEL_ADDRPERM(m),
#endif /* BRIDGE_DEBUG */
error = bridge_member_output(sc, ifp, m);
- if (error != 0) {
+ if (error != 0 && error != EJUSTRETURN) {
printf("%s: bridge_member_output failed error %d\n", __func__,
error);
}
-
out:
BRIDGE_LOCK_ASSERT_NOTHELD(sc);
- return (error);
+ return error;
}
-#endif /* BRIDGE_MEMBER_OUT_FILTER */
static void
bridge_iff_event(void *cookie, ifnet_t ifp, protocol_family_t protocol,
- const struct kev_msg *event_msg)
+ const struct kev_msg *event_msg)
{
#pragma unused(protocol)
struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
event_msg->kev_class == KEV_NETWORK_CLASS &&
event_msg->kev_subclass == KEV_DL_SUBCLASS) {
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: %s event_code %u - %s\n", __func__,
ifp->if_xname, event_msg->event_code,
dlil_kev_dl_code_str(event_msg->event_code));
+ }
#endif /* BRIDGE_DEBUG */
switch (event_msg->event_code) {
- case KEV_DL_IF_DETACHING:
- case KEV_DL_IF_DETACHED: {
- bridge_ifdetach(bif, ifp);
- break;
- }
- case KEV_DL_LINK_OFF:
- case KEV_DL_LINK_ON: {
- bridge_iflinkevent(ifp);
+ case KEV_DL_IF_DETACHING:
+ case KEV_DL_IF_DETACHED: {
+ bridge_ifdetach(ifp);
+ break;
+ }
+ case KEV_DL_LINK_OFF:
+ case KEV_DL_LINK_ON: {
+ bridge_iflinkevent(ifp);
#if BRIDGESTP
- bstp_linkstate(ifp, event_msg->event_code);
+ bstp_linkstate(ifp, event_msg->event_code);
#endif /* BRIDGESTP */
- break;
- }
- case KEV_DL_SIFFLAGS: {
- if ((bif->bif_flags & BIFF_PROMISC) == 0 &&
- (ifp->if_flags & IFF_UP)) {
- errno_t error;
-
- error = ifnet_set_promiscuous(ifp, 1);
- if (error != 0) {
- printf("%s: "
- "ifnet_set_promiscuous (%s)"
- " failed %d\n",
- __func__, ifp->if_xname,
- error);
- } else {
- bif->bif_flags |= BIFF_PROMISC;
- }
+ break;
+ }
+ case KEV_DL_SIFFLAGS: {
+ if ((bif->bif_flags & BIFF_PROMISC) == 0 &&
+ (ifp->if_flags & IFF_UP)) {
+ errno_t error;
+
+ error = ifnet_set_promiscuous(ifp, 1);
+ if (error != 0) {
+ printf("%s: "
+ "ifnet_set_promiscuous (%s)"
+ " failed %d\n",
+ __func__, ifp->if_xname,
+ error);
+ } else {
+ bif->bif_flags |= BIFF_PROMISC;
}
- break;
- }
- case KEV_DL_IFCAP_CHANGED: {
- BRIDGE_LOCK(sc);
- bridge_set_tso(sc);
- BRIDGE_UNLOCK(sc);
- break;
}
- default:
- break;
+ break;
+ }
+ case KEV_DL_IFCAP_CHANGED: {
+ BRIDGE_LOCK(sc);
+ bridge_set_tso(sc);
+ BRIDGE_UNLOCK(sc);
+ break;
+ }
+ case KEV_DL_PROTO_DETACHED:
+ case KEV_DL_PROTO_ATTACHED: {
+ bridge_proto_attach_changed(ifp);
+ break;
+ }
+ default:
+ break;
}
}
}
struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: %s\n", __func__, ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
- bridge_ifdetach(bif, ifp);
+ bridge_ifdetach(ifp);
_FREE(bif, M_DEVBUF);
}
static errno_t
bridge_proto_input(ifnet_t ifp, protocol_family_t protocol, mbuf_t packet,
- char *header)
+ char *header)
{
#pragma unused(protocol, packet, header)
#if BRIDGE_DEBUG
printf("%s: unexpected packet from %s\n", __func__,
ifp->if_xname);
#endif /* BRIDGE_DEBUG */
- return (0);
+ return 0;
}
static int
bridge_attach_protocol(struct ifnet *ifp)
{
- int error;
- struct ifnet_attach_proto_param reg;
+ int error;
+ struct ifnet_attach_proto_param reg;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: %s\n", __func__, ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
- bzero(®, sizeof (reg));
+ bzero(®, sizeof(reg));
reg.input = bridge_proto_input;
error = ifnet_attach_protocol(ifp, PF_BRIDGE, ®);
- if (error)
+ if (error) {
printf("%s: ifnet_attach_protocol(%s) failed, %d\n",
__func__, ifp->if_xname, error);
+ }
- return (error);
+ return error;
}
static int
bridge_detach_protocol(struct ifnet *ifp)
{
- int error;
+ int error;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: %s\n", __func__, ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
error = ifnet_detach_protocol(ifp, PF_BRIDGE);
- if (error)
+ if (error) {
printf("%s: ifnet_detach_protocol(%s) failed, %d\n",
__func__, ifp->if_xname, error);
+ }
- return (error);
+ return error;
}
/*
*/
static void
bridge_delete_member(struct bridge_softc *sc, struct bridge_iflist *bif,
- int gone)
+ int gone)
{
struct ifnet *ifs = bif->bif_ifp, *bifp = sc->sc_ifp;
int lladdr_changed = 0, error, filt_attached;
break;
case IFT_GIF:
- /* currently not supported */
- /* FALLTHRU */
+ /* currently not supported */
+ /* FALLTHRU */
default:
VERIFY(0);
/* NOTREACHED */
BRIDGE_LOCK(sc);
}
#if BRIDGESTP
- if (bif->bif_ifflags & IFBIF_STP)
+ if ((bif->bif_ifflags & IFBIF_STP) != 0) {
bstp_disable(&bif->bif_stp);
+ }
#endif /* BRIDGESTP */
/*
TAILQ_FIRST(&sc->sc_iflist)->bif_ifp;
bcopy(IF_LLADDR(fif), eaddr, ETHER_ADDR_LEN);
sc->sc_ifaddr = fif;
- ifnet_reference(fif); /* for sc_ifaddr */
+ ifnet_reference(fif); /* for sc_ifaddr */
}
lladdr_changed = 1;
}
#if HAS_IF_CAP
- bridge_mutecaps(sc); /* recalculate now this interface is removed */
+ bridge_mutecaps(sc); /* recalculate now this interface is removed */
#endif /* HAS_IF_CAP */
error = bridge_set_tso(sc);
}
bridge_rtdelete(sc, ifs, IFBF_FLUSHALL);
+
KASSERT(bif->bif_addrcnt == 0,
("%s: %d bridge routes referenced", __func__, bif->bif_addrcnt));
BRIDGE_UNLOCK(sc);
+
if (lladdr_changed &&
- (error = ifnet_set_lladdr(bifp, eaddr, ETHER_ADDR_LEN)) != 0)
+ (error = ifnet_set_lladdr(bifp, eaddr, ETHER_ADDR_LEN)) != 0) {
printf("%s: ifnet_set_lladdr failed %d\n", __func__, error);
+ }
- if (event_code != 0)
+ if (event_code != 0) {
bridge_link_event(bifp, event_code);
+ }
#if BRIDGESTP
- bstp_destroy(&bif->bif_stp); /* prepare to free */
+ bstp_destroy(&bif->bif_stp); /* prepare to free */
#endif /* BRIDGESTP */
- if (filt_attached)
+ if (filt_attached) {
iflt_detach(bif->bif_iff_ref);
- else
+ } else {
_FREE(bif, M_DEVBUF);
+ }
ifs->if_bridge = NULL;
ifnet_release(ifs);
u_int32_t event_code = 0;
ifs = ifunit(req->ifbr_ifsname);
- if (ifs == NULL)
- return (ENOENT);
- if (ifs->if_ioctl == NULL) /* must be supported */
- return (EINVAL);
+ if (ifs == NULL) {
+ return ENOENT;
+ }
+ if (ifs->if_ioctl == NULL) { /* must be supported */
+ return EINVAL;
+ }
+
+ if (IFNET_IS_INTCOPROC(ifs)) {
+ return EINVAL;
+ }
/* If it's in the span list, it can't be a member. */
TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
- if (ifs == bif->bif_ifp)
- return (EBUSY);
+ if (ifs == bif->bif_ifp) {
+ return EBUSY;
+ }
- if (ifs->if_bridge == sc)
- return (EEXIST);
+ if (ifs->if_bridge == sc) {
+ return EEXIST;
+ }
- if (ifs->if_bridge != NULL)
- return (EBUSY);
+ if (ifs->if_bridge != NULL) {
+ return EBUSY;
+ }
switch (ifs->if_type) {
case IFT_ETHER:
/* permitted interface types */
break;
case IFT_GIF:
- /* currently not supported */
- /* FALLTHRU */
+ /* currently not supported */
+ /* FALLTHRU */
default:
- return (EINVAL);
+ return EINVAL;
}
- bif = _MALLOC(sizeof (*bif), M_DEVBUF, M_NOWAIT | M_ZERO);
- if (bif == NULL)
- return (ENOMEM);
+ bif = _MALLOC(sizeof(*bif), M_DEVBUF, M_WAITOK | M_ZERO);
+ if (bif == NULL) {
+ return ENOMEM;
+ }
bif->bif_ifp = ifs;
ifnet_reference(ifs);
bif->bif_sc = sc;
/* Allow the first Ethernet member to define the MTU */
- if (TAILQ_EMPTY(&sc->sc_iflist))
+ if (TAILQ_EMPTY(&sc->sc_iflist)) {
sc->sc_ifp->if_mtu = ifs->if_mtu;
- else if (sc->sc_ifp->if_mtu != ifs->if_mtu) {
+ } else if (sc->sc_ifp->if_mtu != ifs->if_mtu) {
printf("%s: %s: invalid MTU for %s", __func__,
sc->sc_ifp->if_xname,
ifs->if_xname);
- return (EINVAL);
+ return EINVAL;
}
/*
!memcmp(IF_LLADDR(sc->sc_ifp), sc->sc_defaddr, ETHER_ADDR_LEN)) {
bcopy(IF_LLADDR(ifs), eaddr, ETHER_ADDR_LEN);
sc->sc_ifaddr = ifs;
- ifnet_reference(ifs); /* for sc_ifaddr */
+ ifnet_reference(ifs); /* for sc_ifaddr */
lladdr_changed = 1;
}
error = ifnet_set_promiscuous(ifs, 1);
if (error) {
/* Ignore error when device is not up */
- if (error != ENETDOWN)
+ if (error != ENETDOWN) {
goto out;
+ }
error = 0;
} else {
bif->bif_flags |= BIFF_PROMISC;
/*
* The new member may change the link status of the bridge interface
*/
- if (interface_media_active(ifs))
+ if (interface_media_active(ifs)) {
bif->bif_flags |= BIFF_MEDIA_ACTIVE;
- else
+ } else {
bif->bif_flags &= ~BIFF_MEDIA_ACTIVE;
+ }
event_code = bridge_updatelinkstatus(sc);
*/
BRIDGE_UNLOCK(sc);
+
/*
* install an interface filter
*/
- memset(&iff, 0, sizeof (struct iff_filter));
+ memset(&iff, 0, sizeof(struct iff_filter));
iff.iff_cookie = bif;
iff.iff_name = "com.apple.kernel.bsd.net.if_bridge";
iff.iff_input = bridge_iff_input;
-#if BRIDGE_MEMBER_OUT_FILTER
iff.iff_output = bridge_iff_output;
-#endif /* BRIDGE_MEMBER_OUT_FILTER */
iff.iff_event = bridge_iff_event;
iff.iff_detached = bridge_iff_detached;
- error = dlil_attach_filter(ifs, &iff, &bif->bif_iff_ref, DLIL_IFF_TSO);
+ error = dlil_attach_filter(ifs, &iff, &bif->bif_iff_ref,
+ DLIL_IFF_TSO | DLIL_IFF_INTERNAL);
if (error != 0) {
printf("%s: iflt_attach failed %d\n", __func__, error);
BRIDGE_LOCK(sc);
goto out;
}
+ BRIDGE_LOCK(sc);
bif->bif_flags |= BIFF_FILTER_ATTACHED;
+ BRIDGE_UNLOCK(sc);
/*
- * install an dummy "bridge" protocol
+ * install a dummy "bridge" protocol
*/
if ((error = bridge_attach_protocol(ifs)) != 0) {
if (error != 0) {
goto out;
}
}
+ BRIDGE_LOCK(sc);
bif->bif_flags |= BIFF_PROTO_ATTACHED;
+ BRIDGE_UNLOCK(sc);
if (lladdr_changed &&
- (error = ifnet_set_lladdr(bifp, eaddr, ETHER_ADDR_LEN)) != 0)
+ (error = ifnet_set_lladdr(bifp, eaddr, ETHER_ADDR_LEN)) != 0) {
printf("%s: ifnet_set_lladdr failed %d\n", __func__, error);
+ }
- if (event_code != 0)
+ if (event_code != 0) {
bridge_link_event(bifp, event_code);
+ }
BRIDGE_LOCK(sc);
out:
- if (error && bif != NULL)
+ if (error && bif != NULL) {
bridge_delete_member(sc, bif, 1);
+ }
- return (error);
+ return error;
}
static int
struct bridge_iflist *bif;
bif = bridge_lookup_member(sc, req->ifbr_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
bridge_delete_member(sc, bif, 0);
- return (0);
+ return 0;
}
static int
bridge_ioctl_purge(struct bridge_softc *sc, void *arg)
{
#pragma unused(sc, arg)
- return (0);
+ return 0;
}
static int
{
struct ifbreq *req = arg;
struct bridge_iflist *bif;
- struct bstp_port *bp;
bif = bridge_lookup_member(sc, req->ifbr_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
+
+ struct bstp_port *bp;
bp = &bif->bif_stp;
- req->ifbr_ifsflags = bif->bif_ifflags;
req->ifbr_state = bp->bp_state;
req->ifbr_priority = bp->bp_priority;
req->ifbr_path_cost = bp->bp_path_cost;
- req->ifbr_portno = bif->bif_ifp->if_index & 0xfff;
req->ifbr_proto = bp->bp_protover;
req->ifbr_role = bp->bp_role;
req->ifbr_stpflags = bp->bp_flags;
- req->ifbr_addrcnt = bif->bif_addrcnt;
- req->ifbr_addrmax = bif->bif_addrmax;
- req->ifbr_addrexceeded = bif->bif_addrexceeded;
-
/* Copy STP state options as flags */
- if (bp->bp_operedge)
+ if (bp->bp_operedge) {
req->ifbr_ifsflags |= IFBIF_BSTP_EDGE;
- if (bp->bp_flags & BSTP_PORT_AUTOEDGE)
+ }
+ if (bp->bp_flags & BSTP_PORT_AUTOEDGE) {
req->ifbr_ifsflags |= IFBIF_BSTP_AUTOEDGE;
- if (bp->bp_ptp_link)
+ }
+ if (bp->bp_ptp_link) {
req->ifbr_ifsflags |= IFBIF_BSTP_PTP;
- if (bp->bp_flags & BSTP_PORT_AUTOPTP)
+ }
+ if (bp->bp_flags & BSTP_PORT_AUTOPTP) {
req->ifbr_ifsflags |= IFBIF_BSTP_AUTOPTP;
- if (bp->bp_flags & BSTP_PORT_ADMEDGE)
+ }
+ if (bp->bp_flags & BSTP_PORT_ADMEDGE) {
req->ifbr_ifsflags |= IFBIF_BSTP_ADMEDGE;
- if (bp->bp_flags & BSTP_PORT_ADMCOST)
+ }
+ if (bp->bp_flags & BSTP_PORT_ADMCOST) {
req->ifbr_ifsflags |= IFBIF_BSTP_ADMCOST;
- return (0);
+ }
+
+ req->ifbr_ifsflags = bif->bif_ifflags;
+ req->ifbr_portno = bif->bif_ifp->if_index & 0xfff;
+ req->ifbr_addrcnt = bif->bif_addrcnt;
+ req->ifbr_addrmax = bif->bif_addrmax;
+ req->ifbr_addrexceeded = bif->bif_addrexceeded;
+
+ return 0;
}
static int
#endif /* BRIDGESTP */
bif = bridge_lookup_member(sc, req->ifbr_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
- if (req->ifbr_ifsflags & IFBIF_SPAN)
+ if (req->ifbr_ifsflags & IFBIF_SPAN) {
/* SPAN is readonly */
- return (EINVAL);
+ return EINVAL;
+ }
#if BRIDGESTP
if (req->ifbr_ifsflags & IFBIF_STP) {
if ((bif->bif_ifflags & IFBIF_STP) == 0) {
error = bstp_enable(&bif->bif_stp);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
}
} else {
- if ((bif->bif_ifflags & IFBIF_STP) != 0)
+ if ((bif->bif_ifflags & IFBIF_STP) != 0) {
bstp_disable(&bif->bif_stp);
+ }
}
/* Pass on STP flags */
bstp_set_ptp(bp, req->ifbr_ifsflags & IFBIF_BSTP_PTP ? 1 : 0);
bstp_set_autoptp(bp, req->ifbr_ifsflags & IFBIF_BSTP_AUTOPTP ? 1 : 0);
#else /* !BRIDGESTP */
- if (req->ifbr_ifsflags & IFBIF_STP)
- return (EOPNOTSUPP);
+ if (req->ifbr_ifsflags & IFBIF_STP) {
+ return EOPNOTSUPP;
+ }
#endif /* !BRIDGESTP */
/* Save the bits relating to the bridge */
bif->bif_ifflags = req->ifbr_ifsflags & IFBIFMASK;
- return (0);
+ return 0;
}
static int
sc->sc_brtmax = param->ifbrp_csize;
bridge_rttrim(sc);
-
- return (0);
+ return 0;
}
static int
param->ifbrp_csize = sc->sc_brtmax;
- return (0);
-}
-
-#define BRIDGE_IOCTL_GIFS do { \
- struct bridge_iflist *bif; \
- struct ifbreq breq; \
- char *buf, *outbuf; \
- unsigned int count, buflen, len; \
- \
- count = 0; \
- TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) \
- count++; \
- TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next) \
- count++; \
- \
- buflen = sizeof (breq) * count; \
- if (bifc->ifbic_len == 0) { \
- bifc->ifbic_len = buflen; \
- return (0); \
- } \
- BRIDGE_UNLOCK(sc); \
- outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO); \
- BRIDGE_LOCK(sc); \
- \
- count = 0; \
- buf = outbuf; \
- len = min(bifc->ifbic_len, buflen); \
- bzero(&breq, sizeof (breq)); \
- TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) { \
- if (len < sizeof (breq)) \
- break; \
- \
- snprintf(breq.ifbr_ifsname, sizeof (breq.ifbr_ifsname), \
- "%s", bif->bif_ifp->if_xname); \
- /* Fill in the ifbreq structure */ \
- error = bridge_ioctl_gifflags(sc, &breq); \
- if (error) \
- break; \
- memcpy(buf, &breq, sizeof (breq)); \
- count++; \
- buf += sizeof (breq); \
- len -= sizeof (breq); \
- } \
- TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next) { \
- if (len < sizeof (breq)) \
- break; \
- \
- snprintf(breq.ifbr_ifsname, sizeof (breq.ifbr_ifsname), \
- "%s", bif->bif_ifp->if_xname); \
- breq.ifbr_ifsflags = bif->bif_ifflags; \
- breq.ifbr_portno = bif->bif_ifp->if_index & 0xfff; \
- memcpy(buf, &breq, sizeof (breq)); \
- count++; \
- buf += sizeof (breq); \
- len -= sizeof (breq); \
- } \
- \
- BRIDGE_UNLOCK(sc); \
- bifc->ifbic_len = sizeof (breq) * count; \
- error = copyout(outbuf, bifc->ifbic_req, bifc->ifbic_len); \
- BRIDGE_LOCK(sc); \
- _FREE(outbuf, M_TEMP); \
+ return 0;
+}
+
+#define BRIDGE_IOCTL_GIFS do { \
+ struct bridge_iflist *bif; \
+ struct ifbreq breq; \
+ char *buf, *outbuf; \
+ unsigned int count, buflen, len; \
+ \
+ count = 0; \
+ TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) \
+ count++; \
+ TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next) \
+ count++; \
+ \
+ buflen = sizeof (breq) * count; \
+ if (bifc->ifbic_len == 0) { \
+ bifc->ifbic_len = buflen; \
+ return (0); \
+ } \
+ BRIDGE_UNLOCK(sc); \
+ outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO); \
+ BRIDGE_LOCK(sc); \
+ \
+ count = 0; \
+ buf = outbuf; \
+ len = min(bifc->ifbic_len, buflen); \
+ bzero(&breq, sizeof (breq)); \
+ TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) { \
+ if (len < sizeof (breq)) \
+ break; \
+ \
+ snprintf(breq.ifbr_ifsname, sizeof (breq.ifbr_ifsname), \
+ "%s", bif->bif_ifp->if_xname); \
+ /* Fill in the ifbreq structure */ \
+ error = bridge_ioctl_gifflags(sc, &breq); \
+ if (error) \
+ break; \
+ memcpy(buf, &breq, sizeof (breq)); \
+ count++; \
+ buf += sizeof (breq); \
+ len -= sizeof (breq); \
+ } \
+ TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next) { \
+ if (len < sizeof (breq)) \
+ break; \
+ \
+ snprintf(breq.ifbr_ifsname, \
+ sizeof (breq.ifbr_ifsname), \
+ "%s", bif->bif_ifp->if_xname); \
+ breq.ifbr_ifsflags = bif->bif_ifflags; \
+ breq.ifbr_portno \
+ = bif->bif_ifp->if_index & 0xfff; \
+ memcpy(buf, &breq, sizeof (breq)); \
+ count++; \
+ buf += sizeof (breq); \
+ len -= sizeof (breq); \
+ } \
+ \
+ BRIDGE_UNLOCK(sc); \
+ bifc->ifbic_len = sizeof (breq) * count; \
+ error = copyout(outbuf, bifc->ifbic_req, bifc->ifbic_len); \
+ BRIDGE_LOCK(sc); \
+ _FREE(outbuf, M_TEMP); \
} while (0)
static int
BRIDGE_IOCTL_GIFS;
- return (error);
+ return error;
}
static int
BRIDGE_IOCTL_GIFS;
- return (error);
-}
-
-#define BRIDGE_IOCTL_RTS do { \
- struct bridge_rtnode *brt; \
- char *buf, *outbuf; \
- unsigned int count, buflen, len; \
- unsigned long now; \
- \
- if (bac->ifbac_len == 0) \
- return (0); \
- \
- count = 0; \
- LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) \
- count++; \
- buflen = sizeof (bareq) * count; \
- \
- BRIDGE_UNLOCK(sc); \
- outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO); \
- BRIDGE_LOCK(sc); \
- \
- count = 0; \
- buf = outbuf; \
- len = min(bac->ifbac_len, buflen); \
- bzero(&bareq, sizeof (bareq)); \
- LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) { \
- if (len < sizeof (bareq)) \
- goto out; \
- snprintf(bareq.ifba_ifsname, sizeof (bareq.ifba_ifsname), \
- "%s", brt->brt_ifp->if_xname); \
- memcpy(bareq.ifba_dst, brt->brt_addr, sizeof (brt->brt_addr)); \
- bareq.ifba_vlan = brt->brt_vlan; \
- if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) { \
- now = (unsigned long) net_uptime(); \
- if (now < brt->brt_expire) \
- bareq.ifba_expire = \
- brt->brt_expire - now; \
- } else \
- bareq.ifba_expire = 0; \
- bareq.ifba_flags = brt->brt_flags; \
- \
- memcpy(buf, &bareq, sizeof (bareq)); \
- count++; \
- buf += sizeof (bareq); \
- len -= sizeof (bareq); \
- } \
-out: \
- BRIDGE_UNLOCK(sc); \
- bac->ifbac_len = sizeof (bareq) * count; \
- error = copyout(outbuf, bac->ifbac_req, bac->ifbac_len); \
- BRIDGE_LOCK(sc); \
- _FREE(outbuf, M_TEMP); \
- return (error); \
+ return error;
+}
+
+#define BRIDGE_IOCTL_RTS do { \
+ struct bridge_rtnode *brt; \
+ char *buf; \
+ char *outbuf = NULL; \
+ unsigned int count, buflen, len; \
+ unsigned long now; \
+ \
+ if (bac->ifbac_len == 0) \
+ return (0); \
+ \
+ bzero(&bareq, sizeof (bareq)); \
+ count = 0; \
+ LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) \
+ count++; \
+ buflen = sizeof (bareq) * count; \
+ \
+ BRIDGE_UNLOCK(sc); \
+ outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO); \
+ BRIDGE_LOCK(sc); \
+ \
+ count = 0; \
+ buf = outbuf; \
+ len = min(bac->ifbac_len, buflen); \
+ LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) { \
+ if (len < sizeof (bareq)) \
+ goto out; \
+ snprintf(bareq.ifba_ifsname, sizeof (bareq.ifba_ifsname), \
+ "%s", brt->brt_ifp->if_xname); \
+ memcpy(bareq.ifba_dst, brt->brt_addr, sizeof (brt->brt_addr)); \
+ bareq.ifba_vlan = brt->brt_vlan; \
+ if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) { \
+ now = (unsigned long) net_uptime(); \
+ if (now < brt->brt_expire) \
+ bareq.ifba_expire = \
+ brt->brt_expire - now; \
+ } else \
+ bareq.ifba_expire = 0; \
+ bareq.ifba_flags = brt->brt_flags; \
+ \
+ memcpy(buf, &bareq, sizeof (bareq)); \
+ count++; \
+ buf += sizeof (bareq); \
+ len -= sizeof (bareq); \
+ } \
+out: \
+ bac->ifbac_len = sizeof (bareq) * count; \
+ if (outbuf != NULL) { \
+ BRIDGE_UNLOCK(sc); \
+ error = copyout(outbuf, bac->ifbac_req, bac->ifbac_len); \
+ _FREE(outbuf, M_TEMP); \
+ BRIDGE_LOCK(sc); \
+ } \
+ return (error); \
} while (0)
static int
int error = 0;
BRIDGE_IOCTL_RTS;
-
- return (error);
+ return error;
}
static int
int error = 0;
BRIDGE_IOCTL_RTS;
-
- return (error);
+ return error;
}
static int
int error;
bif = bridge_lookup_member(sc, req->ifba_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
error = bridge_rtupdate(sc, req->ifba_dst, req->ifba_vlan, bif, 1,
req->ifba_flags);
- return (error);
+ return error;
}
static int
int error;
bif = bridge_lookup_member(sc, req->ifba_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
error = bridge_rtupdate(sc, req->ifba_dst, req->ifba_vlan, bif, 1,
req->ifba_flags);
- return (error);
+ return error;
}
static int
struct ifbrparam *param = arg;
sc->sc_brttimeout = param->ifbrp_ctime;
- return (0);
+ return 0;
}
static int
struct ifbrparam *param = arg;
param->ifbrp_ctime = sc->sc_brttimeout;
- return (0);
+ return 0;
}
static int
{
struct ifbareq32 *req = arg;
- return (bridge_rtdaddr(sc, req->ifba_dst, req->ifba_vlan));
+ return bridge_rtdaddr(sc, req->ifba_dst, req->ifba_vlan);
}
static int
{
struct ifbareq64 *req = arg;
- return (bridge_rtdaddr(sc, req->ifba_dst, req->ifba_vlan));
+ return bridge_rtdaddr(sc, req->ifba_dst, req->ifba_vlan);
}
static int
struct ifbreq *req = arg;
bridge_rtflush(sc, req->ifbr_ifsflags);
- return (0);
+ return 0;
}
static int
struct bstp_state *bs = &sc->sc_stp;
param->ifbrp_prio = bs->bs_bridge_priority;
- return (0);
+ return 0;
}
static int
#if BRIDGESTP
struct ifbrparam *param = arg;
- return (bstp_set_priority(&sc->sc_stp, param->ifbrp_prio));
+ return bstp_set_priority(&sc->sc_stp, param->ifbrp_prio);
#else /* !BRIDGESTP */
#pragma unused(sc, arg)
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
#endif /* !BRIDGESTP */
}
struct bstp_state *bs = &sc->sc_stp;
param->ifbrp_hellotime = bs->bs_bridge_htime >> 8;
- return (0);
+ return 0;
}
static int
#if BRIDGESTP
struct ifbrparam *param = arg;
- return (bstp_set_htime(&sc->sc_stp, param->ifbrp_hellotime));
+ return bstp_set_htime(&sc->sc_stp, param->ifbrp_hellotime);
#else /* !BRIDGESTP */
#pragma unused(sc, arg)
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
#endif /* !BRIDGESTP */
}
static int
bridge_ioctl_gfd(struct bridge_softc *sc, void *arg)
{
- struct ifbrparam *param = arg;
- struct bstp_state *bs = &sc->sc_stp;
+ struct ifbrparam *param;
+ struct bstp_state *bs;
+ param = arg;
+ bs = &sc->sc_stp;
param->ifbrp_fwddelay = bs->bs_bridge_fdelay >> 8;
- return (0);
+ return 0;
}
static int
#if BRIDGESTP
struct ifbrparam *param = arg;
- return (bstp_set_fdelay(&sc->sc_stp, param->ifbrp_fwddelay));
+ return bstp_set_fdelay(&sc->sc_stp, param->ifbrp_fwddelay);
#else /* !BRIDGESTP */
#pragma unused(sc, arg)
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
#endif /* !BRIDGESTP */
}
static int
bridge_ioctl_gma(struct bridge_softc *sc, void *arg)
{
- struct ifbrparam *param = arg;
- struct bstp_state *bs = &sc->sc_stp;
+ struct ifbrparam *param;
+ struct bstp_state *bs;
+ param = arg;
+ bs = &sc->sc_stp;
param->ifbrp_maxage = bs->bs_bridge_max_age >> 8;
- return (0);
+ return 0;
}
static int
#if BRIDGESTP
struct ifbrparam *param = arg;
- return (bstp_set_maxage(&sc->sc_stp, param->ifbrp_maxage));
+ return bstp_set_maxage(&sc->sc_stp, param->ifbrp_maxage);
#else /* !BRIDGESTP */
#pragma unused(sc, arg)
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
#endif /* !BRIDGESTP */
}
struct bridge_iflist *bif;
bif = bridge_lookup_member(sc, req->ifbr_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
- return (bstp_set_port_priority(&bif->bif_stp, req->ifbr_priority));
+ return bstp_set_port_priority(&bif->bif_stp, req->ifbr_priority);
#else /* !BRIDGESTP */
#pragma unused(sc, arg)
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
#endif /* !BRIDGESTP */
}
struct bridge_iflist *bif;
bif = bridge_lookup_member(sc, req->ifbr_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
- return (bstp_set_path_cost(&bif->bif_stp, req->ifbr_path_cost));
+ return bstp_set_path_cost(&bif->bif_stp, req->ifbr_path_cost);
#else /* !BRIDGESTP */
#pragma unused(sc, arg)
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
#endif /* !BRIDGESTP */
}
param->ifbrp_filter = sc->sc_filter_flags;
- return (0);
+ return 0;
}
static int
{
struct ifbrparam *param = arg;
- if (param->ifbrp_filter & ~IFBF_FILT_MASK)
- return (EINVAL);
+ if (param->ifbrp_filter & ~IFBF_FILT_MASK) {
+ return EINVAL;
+ }
#ifndef BRIDGE_IPF
- if (param->ifbrp_filter & IFBF_FILT_USEIPF)
- return (EINVAL);
+ if (param->ifbrp_filter & IFBF_FILT_USEIPF) {
+ return EINVAL;
+ }
#endif
sc->sc_filter_flags = param->ifbrp_filter;
- return (0);
+ return 0;
}
static int
struct bridge_iflist *bif;
bif = bridge_lookup_member(sc, req->ifbr_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
bif->bif_addrmax = req->ifbr_addrmax;
- return (0);
+ return 0;
}
static int
struct ifnet *ifs;
ifs = ifunit(req->ifbr_ifsname);
- if (ifs == NULL)
- return (ENOENT);
+ if (ifs == NULL) {
+ return ENOENT;
+ }
+
+ if (IFNET_IS_INTCOPROC(ifs)) {
+ return EINVAL;
+ }
TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
- if (ifs == bif->bif_ifp)
- return (EBUSY);
+ if (ifs == bif->bif_ifp) {
+ return EBUSY;
+ }
- if (ifs->if_bridge != NULL)
- return (EBUSY);
+ if (ifs->if_bridge != NULL) {
+ return EBUSY;
+ }
switch (ifs->if_type) {
- case IFT_ETHER:
- case IFT_L2VLAN:
- break;
- case IFT_GIF:
- /* currently not supported */
- /* FALLTHRU */
- default:
- return (EINVAL);
+ case IFT_ETHER:
+ case IFT_L2VLAN:
+ break;
+ case IFT_GIF:
+ /* currently not supported */
+ /* FALLTHRU */
+ default:
+ return EINVAL;
}
- bif = _MALLOC(sizeof (*bif), M_DEVBUF, M_NOWAIT | M_ZERO);
- if (bif == NULL)
- return (ENOMEM);
+ bif = _MALLOC(sizeof(*bif), M_DEVBUF, M_WAITOK | M_ZERO);
+ if (bif == NULL) {
+ return ENOMEM;
+ }
bif->bif_ifp = ifs;
bif->bif_ifflags = IFBIF_SPAN;
TAILQ_INSERT_HEAD(&sc->sc_spanlist, bif, bif_next);
- return (0);
+ return 0;
}
static int
struct ifnet *ifs;
ifs = ifunit(req->ifbr_ifsname);
- if (ifs == NULL)
- return (ENOENT);
+ if (ifs == NULL) {
+ return ENOENT;
+ }
TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
- if (ifs == bif->bif_ifp)
- break;
+ if (ifs == bif->bif_ifp) {
+ break;
+ }
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
bridge_delete_span(sc, bif);
- return (0);
-}
-
-#define BRIDGE_IOCTL_GBPARAM do { \
- struct bstp_state *bs = &sc->sc_stp; \
- struct bstp_port *root_port; \
- \
- req->ifbop_maxage = bs->bs_bridge_max_age >> 8; \
- req->ifbop_hellotime = bs->bs_bridge_htime >> 8; \
- req->ifbop_fwddelay = bs->bs_bridge_fdelay >> 8; \
- \
- root_port = bs->bs_root_port; \
- if (root_port == NULL) \
- req->ifbop_root_port = 0; \
- else \
- req->ifbop_root_port = root_port->bp_ifp->if_index; \
- \
- req->ifbop_holdcount = bs->bs_txholdcount; \
- req->ifbop_priority = bs->bs_bridge_priority; \
- req->ifbop_protocol = bs->bs_protover; \
- req->ifbop_root_path_cost = bs->bs_root_pv.pv_cost; \
- req->ifbop_bridgeid = bs->bs_bridge_pv.pv_dbridge_id; \
- req->ifbop_designated_root = bs->bs_root_pv.pv_root_id; \
- req->ifbop_designated_bridge = bs->bs_root_pv.pv_dbridge_id; \
- req->ifbop_last_tc_time.tv_sec = bs->bs_last_tc_time.tv_sec; \
- req->ifbop_last_tc_time.tv_usec = bs->bs_last_tc_time.tv_usec; \
+ return 0;
+}
+
+#define BRIDGE_IOCTL_GBPARAM do { \
+ struct bstp_state *bs = &sc->sc_stp; \
+ struct bstp_port *root_port; \
+ \
+ req->ifbop_maxage = bs->bs_bridge_max_age >> 8; \
+ req->ifbop_hellotime = bs->bs_bridge_htime >> 8; \
+ req->ifbop_fwddelay = bs->bs_bridge_fdelay >> 8; \
+ \
+ root_port = bs->bs_root_port; \
+ if (root_port == NULL) \
+ req->ifbop_root_port = 0; \
+ else \
+ req->ifbop_root_port = root_port->bp_ifp->if_index; \
+ \
+ req->ifbop_holdcount = bs->bs_txholdcount; \
+ req->ifbop_priority = bs->bs_bridge_priority; \
+ req->ifbop_protocol = bs->bs_protover; \
+ req->ifbop_root_path_cost = bs->bs_root_pv.pv_cost; \
+ req->ifbop_bridgeid = bs->bs_bridge_pv.pv_dbridge_id; \
+ req->ifbop_designated_root = bs->bs_root_pv.pv_root_id; \
+ req->ifbop_designated_bridge = bs->bs_root_pv.pv_dbridge_id; \
+ req->ifbop_last_tc_time.tv_sec = bs->bs_last_tc_time.tv_sec; \
+ req->ifbop_last_tc_time.tv_usec = bs->bs_last_tc_time.tv_usec; \
} while (0)
static int
struct ifbropreq32 *req = arg;
BRIDGE_IOCTL_GBPARAM;
-
- return (0);
+ return 0;
}
static int
struct ifbropreq64 *req = arg;
BRIDGE_IOCTL_GBPARAM;
-
- return (0);
+ return 0;
}
static int
struct ifbrparam *param = arg;
param->ifbrp_cexceeded = sc->sc_brtexceeded;
- return (0);
-}
-
-#define BRIDGE_IOCTL_GIFSSTP do { \
- struct bridge_iflist *bif; \
- struct bstp_port *bp; \
- struct ifbpstpreq bpreq; \
- char *buf, *outbuf; \
- unsigned int count, buflen, len; \
- \
- count = 0; \
- TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) { \
- if ((bif->bif_ifflags & IFBIF_STP) != 0) \
- count++; \
- } \
- \
- buflen = sizeof (bpreq) * count; \
- if (bifstp->ifbpstp_len == 0) { \
- bifstp->ifbpstp_len = buflen; \
- return (0); \
- } \
- \
- BRIDGE_UNLOCK(sc); \
- outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO); \
- BRIDGE_LOCK(sc); \
- \
- count = 0; \
- buf = outbuf; \
- len = min(bifstp->ifbpstp_len, buflen); \
- bzero(&bpreq, sizeof (bpreq)); \
- TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) { \
- if (len < sizeof (bpreq)) \
- break; \
- \
- if ((bif->bif_ifflags & IFBIF_STP) == 0) \
- continue; \
- \
- bp = &bif->bif_stp; \
- bpreq.ifbp_portno = bif->bif_ifp->if_index & 0xfff; \
- bpreq.ifbp_fwd_trans = bp->bp_forward_transitions; \
- bpreq.ifbp_design_cost = bp->bp_desg_pv.pv_cost; \
- bpreq.ifbp_design_port = bp->bp_desg_pv.pv_port_id; \
- bpreq.ifbp_design_bridge = bp->bp_desg_pv.pv_dbridge_id; \
- bpreq.ifbp_design_root = bp->bp_desg_pv.pv_root_id; \
- \
- memcpy(buf, &bpreq, sizeof (bpreq)); \
- count++; \
- buf += sizeof (bpreq); \
- len -= sizeof (bpreq); \
- } \
- \
- BRIDGE_UNLOCK(sc); \
- bifstp->ifbpstp_len = sizeof (bpreq) * count; \
+ return 0;
+}
+
+#define BRIDGE_IOCTL_GIFSSTP do { \
+ struct bridge_iflist *bif; \
+ struct bstp_port *bp; \
+ struct ifbpstpreq bpreq; \
+ char *buf, *outbuf; \
+ unsigned int count, buflen, len; \
+ \
+ count = 0; \
+ TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) { \
+ if ((bif->bif_ifflags & IFBIF_STP) != 0) \
+ count++; \
+ } \
+ \
+ buflen = sizeof (bpreq) * count; \
+ if (bifstp->ifbpstp_len == 0) { \
+ bifstp->ifbpstp_len = buflen; \
+ return (0); \
+ } \
+ \
+ BRIDGE_UNLOCK(sc); \
+ outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO); \
+ BRIDGE_LOCK(sc); \
+ \
+ count = 0; \
+ buf = outbuf; \
+ len = min(bifstp->ifbpstp_len, buflen); \
+ bzero(&bpreq, sizeof (bpreq)); \
+ TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) { \
+ if (len < sizeof (bpreq)) \
+ break; \
+ \
+ if ((bif->bif_ifflags & IFBIF_STP) == 0) \
+ continue; \
+ \
+ bp = &bif->bif_stp; \
+ bpreq.ifbp_portno = bif->bif_ifp->if_index & 0xfff; \
+ bpreq.ifbp_fwd_trans = bp->bp_forward_transitions; \
+ bpreq.ifbp_design_cost = bp->bp_desg_pv.pv_cost; \
+ bpreq.ifbp_design_port = bp->bp_desg_pv.pv_port_id; \
+ bpreq.ifbp_design_bridge = bp->bp_desg_pv.pv_dbridge_id; \
+ bpreq.ifbp_design_root = bp->bp_desg_pv.pv_root_id; \
+ \
+ memcpy(buf, &bpreq, sizeof (bpreq)); \
+ count++; \
+ buf += sizeof (bpreq); \
+ len -= sizeof (bpreq); \
+ } \
+ \
+ BRIDGE_UNLOCK(sc); \
+ bifstp->ifbpstp_len = sizeof (bpreq) * count; \
error = copyout(outbuf, bifstp->ifbpstp_req, bifstp->ifbpstp_len); \
- BRIDGE_LOCK(sc); \
- _FREE(outbuf, M_TEMP); \
- return (error); \
+ BRIDGE_LOCK(sc); \
+ _FREE(outbuf, M_TEMP); \
+ return (error); \
} while (0)
static int
int error = 0;
BRIDGE_IOCTL_GIFSSTP;
-
- return (error);
+ return error;
}
static int
int error = 0;
BRIDGE_IOCTL_GIFSSTP;
-
- return (error);
+ return error;
}
static int
#if BRIDGESTP
struct ifbrparam *param = arg;
- return (bstp_set_protocol(&sc->sc_stp, param->ifbrp_proto));
+ return bstp_set_protocol(&sc->sc_stp, param->ifbrp_proto);
#else /* !BRIDGESTP */
#pragma unused(sc, arg)
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
#endif /* !BRIDGESTP */
}
#if BRIDGESTP
struct ifbrparam *param = arg;
- return (bstp_set_holdcount(&sc->sc_stp, param->ifbrp_txhc));
+ return bstp_set_holdcount(&sc->sc_stp, param->ifbrp_txhc);
#else /* !BRIDGESTP */
#pragma unused(sc, arg)
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
#endif /* !BRIDGESTP */
}
struct bridge_iflist *bif;
bif = bridge_lookup_member(sc, req->ifbrhf_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
bzero(req, sizeof(struct ifbrhostfilter));
if (bif->bif_flags & BIFF_HOST_FILTER) {
ETHER_ADDR_LEN);
req->ifbrhf_ipsrc = bif->bif_hf_ipsrc.s_addr;
}
- return (0);
+ return 0;
}
static int
struct bridge_iflist *bif;
bif = bridge_lookup_member(sc, req->ifbrhf_ifsname);
- if (bif == NULL)
- return (ENOENT);
+ if (bif == NULL) {
+ return ENOENT;
+ }
+
+ INC_ATOMIC_INT64_LIM(net_api_stats.nas_vmnet_total);
if (req->ifbrhf_flags & IFBRHF_ENABLED) {
bif->bif_flags |= BIFF_HOST_FILTER;
bcopy(req->ifbrhf_hwsrca, bif->bif_hf_hwsrc,
ETHER_ADDR_LEN);
if (bcmp(req->ifbrhf_hwsrca, ethernulladdr,
- ETHER_ADDR_LEN) != 0)
+ ETHER_ADDR_LEN) != 0) {
bif->bif_flags |= BIFF_HF_HWSRC;
- else
+ } else {
bif->bif_flags &= ~BIFF_HF_HWSRC;
+ }
}
if (req->ifbrhf_flags & IFBRHF_IPSRC) {
bif->bif_hf_ipsrc.s_addr = req->ifbrhf_ipsrc;
- if (bif->bif_hf_ipsrc.s_addr != INADDR_ANY)
+ if (bif->bif_hf_ipsrc.s_addr != INADDR_ANY) {
bif->bif_flags |= BIFF_HF_IPSRC;
- else
+ } else {
bif->bif_flags &= ~BIFF_HF_IPSRC;
+ }
}
} else {
bif->bif_flags &= ~(BIFF_HOST_FILTER | BIFF_HF_HWSRC |
bif->bif_hf_ipsrc.s_addr = INADDR_ANY;
}
- return (0);
+ return 0;
}
* Detach an interface from a bridge. Called when a member
* interface is detaching.
*/
-__private_extern__ void
-bridge_ifdetach(struct bridge_iflist *bif, struct ifnet *ifp)
+static void
+bridge_ifdetach(struct ifnet *ifp)
{
+ struct bridge_iflist *bif;
struct bridge_softc *sc = ifp->if_bridge;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: %s\n", __func__, ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
/* Check if the interface is a bridge member */
if (sc != NULL) {
BRIDGE_LOCK(sc);
bif = bridge_lookup_member_if(sc, ifp);
- if (bif != NULL)
+ if (bif != NULL) {
bridge_delete_member(sc, bif, 1);
+ }
BRIDGE_UNLOCK(sc);
return;
}
-
/* Check if the interface is a span port */
lck_mtx_lock(&bridge_list_mtx);
LIST_FOREACH(sc, &bridge_list, sc_list) {
BRIDGE_LOCK(sc);
TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
- if (ifp == bif->bif_ifp) {
- bridge_delete_span(sc, bif);
- break;
- }
+ if (ifp == bif->bif_ifp) {
+ bridge_delete_span(sc, bif);
+ break;
+ }
BRIDGE_UNLOCK(sc);
}
lck_mtx_unlock(&bridge_list_mtx);
}
+/*
+ * bridge_proto_attach_changed
+ *
+ * Called when protocol attachment on the interface changes.
+ */
+static void
+bridge_proto_attach_changed(struct ifnet *ifp)
+{
+ boolean_t changed = FALSE;
+ struct bridge_iflist *bif;
+ boolean_t input_broadcast;
+ struct bridge_softc *sc = ifp->if_bridge;
+
+#if BRIDGE_DEBUG
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+ printf("%s: %s\n", __func__, ifp->if_xname);
+ }
+#endif /* BRIDGE_DEBUG */
+ if (sc == NULL) {
+ return;
+ }
+ /*
+ * Selectively enable input broadcast only when necessary.
+ * The bridge interface itself attaches a fake protocol
+ * so checking for at least two protocols means that the
+ * interface is being used for something besides bridging.
+ */
+ input_broadcast = if_get_protolist(ifp, NULL, 0) >= 2;
+ BRIDGE_LOCK(sc);
+ bif = bridge_lookup_member_if(sc, ifp);
+ if (bif != NULL) {
+ if (input_broadcast) {
+ if ((bif->bif_flags & BIFF_INPUT_BROADCAST) == 0) {
+ bif->bif_flags |= BIFF_INPUT_BROADCAST;
+ changed = TRUE;
+ }
+ } else if ((bif->bif_flags & BIFF_INPUT_BROADCAST) != 0) {
+ changed = TRUE;
+ bif->bif_flags &= ~BIFF_INPUT_BROADCAST;
+ }
+ }
+ BRIDGE_UNLOCK(sc);
+#if BRIDGE_DEBUG
+ if ((if_bridge_debug & BR_DBGF_LIFECYCLE) != 0 && changed) {
+ printf("%s: input broadcast %s", ifp->if_xname,
+ input_broadcast ? "ENABLED" : "DISABLED");
+ }
+#endif /* BRIDGE_DEBUG */
+ return;
+}
+
/*
* interface_media_active:
*
bzero(&ifmr, sizeof(ifmr));
if (ifnet_ioctl(ifp, 0, SIOCGIFMEDIA, &ifmr) == 0) {
- if ((ifmr.ifm_status & IFM_AVALID) && ifmr.ifm_count > 0)
+ if ((ifmr.ifm_status & IFM_AVALID) && ifmr.ifm_count > 0) {
status = ifmr.ifm_status & IFM_ACTIVE ? 1 : 0;
+ }
}
- return (status);
+ return status;
}
/*
* bridge_updatelinkstatus:
*
- * Update the media active status of the bridge based on the
+ * Update the media active status of the bridge based on the
* media active status of its member.
* If changed, return the corresponding onf/off link event.
*/
event_code = KEV_DL_LINK_OFF;
}
- return (event_code);
+ return event_code;
}
/*
u_int32_t event_code = 0;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: %s\n", __func__, ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
/* Check if the interface is a bridge member */
- if (sc == NULL)
+ if (sc == NULL) {
return;
+ }
BRIDGE_LOCK(sc);
bif = bridge_lookup_member_if(sc, ifp);
if (bif != NULL) {
- if (interface_media_active(ifp))
+ if (interface_media_active(ifp)) {
bif->bif_flags |= BIFF_MEDIA_ACTIVE;
- else
+ } else {
bif->bif_flags &= ~BIFF_MEDIA_ACTIVE;
+ }
- event_code = bridge_updatelinkstatus(sc);
+ event_code = bridge_updatelinkstatus(sc);
}
BRIDGE_UNLOCK(sc);
- if (event_code != 0)
+ if (event_code != 0) {
bridge_link_event(sc->sc_ifp, event_code);
+ }
}
/*
BRIDGE_LOCK(sc);
#if BRIDGE_DEBUG_DELAYED_CALLBACK
- if (if_bridge_debug & BR_DBGF_DELAYED_CALL)
+ if (if_bridge_debug & BR_DBGF_DELAYED_CALL) {
printf("%s: %s call 0x%llx flags 0x%x\n", __func__,
sc->sc_if_xname, (uint64_t)VM_KERNEL_ADDRPERM(call),
call->bdc_flags);
+ }
#endif /* BRIDGE_DEBUG_DELAYED_CALLBACK */
if (call->bdc_flags & BDCF_CANCELLING) {
wakeup(call);
} else {
- if ((sc->sc_flags & SCF_DETACHING) == 0)
+ if ((sc->sc_flags & SCF_DETACHING) == 0) {
(*call->bdc_func)(sc);
}
+ }
call->bdc_flags &= ~BDCF_OUTSTANDING;
BRIDGE_UNLOCK(sc);
}
* bridge_schedule_delayed_call:
*
* Schedule a function to be called on a separate thread
- * The actual call may be scheduled to run at a given time or ASAP.
+ * The actual call may be scheduled to run at a given time or ASAP.
*/
static void
bridge_schedule_delayed_call(struct bridge_delayed_call *call)
BRIDGE_LOCK_ASSERT_HELD(sc);
if ((sc->sc_flags & SCF_DETACHING) ||
- (call->bdc_flags & (BDCF_OUTSTANDING | BDCF_CANCELLING)))
+ (call->bdc_flags & (BDCF_OUTSTANDING | BDCF_CANCELLING))) {
return;
+ }
if (call->bdc_ts.tv_sec || call->bdc_ts.tv_nsec) {
nanoseconds_to_absolutetime(
- (uint64_t)call->bdc_ts.tv_sec * NSEC_PER_SEC +
- call->bdc_ts.tv_nsec, &deadline);
+ (uint64_t)call->bdc_ts.tv_sec * NSEC_PER_SEC +
+ call->bdc_ts.tv_nsec, &deadline);
clock_absolutetime_interval_to_deadline(deadline, &deadline);
}
call->bdc_flags = BDCF_OUTSTANDING;
#if BRIDGE_DEBUG_DELAYED_CALLBACK
- if (if_bridge_debug & BR_DBGF_DELAYED_CALL)
+ if (if_bridge_debug & BR_DBGF_DELAYED_CALL) {
printf("%s: %s call 0x%llx flags 0x%x\n", __func__,
sc->sc_if_xname, (uint64_t)VM_KERNEL_ADDRPERM(call),
call->bdc_flags);
+ }
#endif /* BRIDGE_DEBUG_DELAYED_CALLBACK */
- if (call->bdc_ts.tv_sec || call->bdc_ts.tv_nsec)
+ if (call->bdc_ts.tv_sec || call->bdc_ts.tv_nsec) {
thread_call_func_delayed(
(thread_call_func_t)bridge_delayed_callback,
call, deadline);
- else {
- if (call->bdc_thread_call == NULL)
+ } else {
+ if (call->bdc_thread_call == NULL) {
call->bdc_thread_call = thread_call_allocate(
(thread_call_func_t)bridge_delayed_callback,
call);
+ }
thread_call_enter(call->bdc_thread_call);
}
}
/*
* The call was never scheduled
*/
- if (sc == NULL)
+ if (sc == NULL) {
return;
+ }
BRIDGE_LOCK_ASSERT_HELD(sc);
while (call->bdc_flags & BDCF_OUTSTANDING) {
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_DELAYED_CALL)
+ if (if_bridge_debug & BR_DBGF_DELAYED_CALL) {
printf("%s: %s call 0x%llx flags 0x%x\n", __func__,
sc->sc_if_xname, (uint64_t)VM_KERNEL_ADDRPERM(call),
call->bdc_flags);
+ }
#endif /* BRIDGE_DEBUG */
result = thread_call_func_cancel(
- (thread_call_func_t)bridge_delayed_callback, call, FALSE);
+ (thread_call_func_t)bridge_delayed_callback, call, FALSE);
if (result) {
/*
/*
* The call was never scheduled
*/
- if (sc == NULL)
+ if (sc == NULL) {
return;
+ }
BRIDGE_LOCK_ASSERT_HELD(sc);
if (call->bdc_thread_call != NULL) {
result = thread_call_free(call->bdc_thread_call);
- if (result == FALSE)
+ if (result == FALSE) {
panic("%s thread_call_free() failed for call %p",
- __func__, call);
+ __func__, call);
+ }
call->bdc_thread_call = NULL;
}
}
BRIDGE_LOCK_ASSERT_HELD(sc);
- if ((ifnet_flags(ifp) & IFF_RUNNING))
- return (0);
+ if ((ifnet_flags(ifp) & IFF_RUNNING)) {
+ return 0;
+ }
error = ifnet_set_flags(ifp, IFF_RUNNING, IFF_RUNNING);
* age so we're just going to arm the timer
*/
bridge_aging_timer(sc);
-
#if BRIDGESTP
- if (error == 0)
- bstp_init(&sc->sc_stp); /* Initialize Spanning Tree */
+ if (error == 0) {
+ bstp_init(&sc->sc_stp); /* Initialize Spanning Tree */
+ }
#endif /* BRIDGESTP */
-
- return (error);
+ return error;
}
/*
BRIDGE_LOCK_ASSERT_HELD(sc);
- if ((ifnet_flags(ifp) & IFF_RUNNING) == 0)
+ if ((ifnet_flags(ifp) & IFF_RUNNING) == 0) {
+ return;
+ }
+
+ bridge_cancel_delayed_call(&sc->sc_aging_timer);
+
+#if BRIDGESTP
+ bstp_stop(&sc->sc_stp);
+#endif /* BRIDGESTP */
+
+ bridge_rtflush(sc, IFBF_FLUSHDYN);
+ (void) ifnet_set_flags(ifp, 0, IFF_RUNNING);
+}
+
+/*
+ * bridge_compute_cksum:
+ *
+ * If the packet has checksum flags, compare the hardware checksum
+ * capabilities of the source and destination interfaces. If they
+ * are the same, there's nothing to do. If they are different,
+ * finalize the checksum so that it can be sent on the destination
+ * interface.
+ */
+static void
+bridge_compute_cksum(struct ifnet *src_if, struct ifnet *dst_if, struct mbuf *m)
+{
+ uint32_t csum_flags;
+ uint16_t dst_hw_csum;
+ uint32_t did_sw;
+ struct ether_header *eh;
+ uint16_t src_hw_csum;
+
+ csum_flags = m->m_pkthdr.csum_flags & IF_HWASSIST_CSUM_MASK;
+ if (csum_flags == 0) {
+ /* no checksum offload */
return;
+ }
- bridge_cancel_delayed_call(&sc->sc_aging_timer);
-
-#if BRIDGESTP
- bstp_stop(&sc->sc_stp);
-#endif /* BRIDGESTP */
-
- bridge_rtflush(sc, IFBF_FLUSHDYN);
-
- (void) ifnet_set_flags(ifp, 0, IFF_RUNNING);
+ /*
+ * if destination/source differ in checksum offload
+ * capabilities, finalize/compute the checksum
+ */
+ dst_hw_csum = IF_HWASSIST_CSUM_FLAGS(dst_if->if_hwassist);
+ src_hw_csum = IF_HWASSIST_CSUM_FLAGS(src_if->if_hwassist);
+ if (dst_hw_csum == src_hw_csum) {
+ return;
+ }
+ eh = mtod(m, struct ether_header *);
+ switch (ntohs(eh->ether_type)) {
+ case ETHERTYPE_IP:
+ did_sw = in_finalize_cksum(m, sizeof(*eh), csum_flags);
+ break;
+#if INET6
+ case ETHERTYPE_IPV6:
+ did_sw = in6_finalize_cksum(m, sizeof(*eh), -1, -1, csum_flags);
+ break;
+#endif /* INET6 */
+ }
+#if BRIDGE_DEBUG
+ if (if_bridge_debug & BR_DBGF_CHECKSUM) {
+ printf("%s: [%s -> %s] before 0x%x did 0x%x after 0x%x\n",
+ __func__,
+ src_if->if_xname, dst_if->if_xname, csum_flags, did_sw,
+ m->m_pkthdr.csum_flags);
+ }
+#endif /* BRIDGE_DEBUG */
}
/*
*
*/
static int
-bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m)
+bridge_enqueue(struct bridge_softc *sc, struct ifnet *src_ifp,
+ struct ifnet *dst_ifp, struct mbuf *m, ChecksumOperation cksum_op)
{
int len, error = 0;
- short mflags;
- struct mbuf *m0;
+ struct mbuf *next_m;
VERIFY(dst_ifp != NULL);
*
* NOTE: bridge_fragment() is called only when PFIL_HOOKS is enabled.
*/
- for (; m; m = m0) {
+ for (; m; m = next_m) {
errno_t _error;
- struct flowadv adv = { FADV_SUCCESS };
+ struct flowadv adv = { .code = FADV_SUCCESS };
- m0 = m->m_nextpkt;
+ next_m = m->m_nextpkt;
m->m_nextpkt = NULL;
len = m->m_pkthdr.len;
- mflags = m->m_flags;
m->m_flags |= M_PROTO1; /* set to avoid loops */
- bridge_finalize_cksum(dst_ifp, m);
-
+ switch (cksum_op) {
+ case kChecksumOperationClear:
+ m->m_pkthdr.csum_flags = 0;
+ break;
+ case kChecksumOperationFinalize:
+ /* the checksum might not be correct, finalize now */
+ bridge_finalize_cksum(dst_ifp, m);
+ break;
+ case kChecksumOperationCompute:
+ bridge_compute_cksum(src_ifp, dst_ifp, m);
+ break;
+ default:
+ break;
+ }
#if HAS_IF_CAP
/*
* If underlying interface can not do VLAN tag insertion itself
/* Preserve existing error value */
if (error == 0) {
- if (_error != 0)
+ if (_error != 0) {
error = _error;
- else if (adv.code == FADV_FLOW_CONTROLLED)
+ } else if (adv.code == FADV_FLOW_CONTROLLED) {
error = EQFULL;
- else if (adv.code == FADV_SUSPENDED)
+ } else if (adv.code == FADV_SUSPENDED) {
error = EQSUSPENDED;
+ }
}
if (_error == 0) {
}
}
- return (error);
+ return error;
}
#if HAS_BRIDGE_DUMMYNET
sc = ifp->if_bridge;
/*
- * The packet didnt originate from a member interface. This should only
+ * The packet didn't originate from a member interface. This should only
* ever happen if a member interface is removed while packets are
* queued for it.
*/
}
if (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6) {
- if (bridge_pfil(&m, sc->sc_ifp, ifp, PFIL_OUT) != 0)
+ if (bridge_pfil(&m, sc->sc_ifp, ifp, PFIL_OUT) != 0) {
return;
- if (m == NULL)
+ }
+ if (m == NULL) {
return;
+ }
}
- (void) bridge_enqueue(sc, ifp, m);
+ (void) bridge_enqueue(sc, NULL, ifp, m, kChecksumOperationNone);
}
#endif /* HAS_BRIDGE_DUMMYNET */
-#if BRIDGE_MEMBER_OUT_FILTER
/*
* bridge_member_output:
*
* performs the bridging function for locally originated
* packets.
*
- * The mbuf has the Ethernet header already attached. We must
- * enqueue or free the mbuf before returning.
+ * The mbuf has the Ethernet header already attached.
*/
-static int
-bridge_member_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
- struct rtentry *rt)
+static errno_t
+bridge_member_output(struct bridge_softc *sc, ifnet_t ifp, mbuf_t m)
{
-#pragma unused(sa, rt)
struct ether_header *eh;
struct ifnet *dst_if;
- struct bridge_softc *sc;
uint16_t vlan;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_OUTPPUT)
+ if (if_bridge_debug & BR_DBGF_OUTPUT) {
printf("%s: ifp %s\n", __func__, ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
if (m->m_len < ETHER_HDR_LEN) {
m = m_pullup(m, ETHER_HDR_LEN);
- if (m == NULL)
- return (0);
+ if (m == NULL) {
+ return ENOBUFS;
+ }
}
eh = mtod(m, struct ether_header *);
- sc = ifp->if_bridge;
vlan = VLANTAGOF(m);
BRIDGE_LOCK(sc);
* If the packet is a multicast, or we don't know a better way to
* get there, send to all interfaces.
*/
- if (ETHER_IS_MULTICAST(eh->ether_dhost))
+ if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
dst_if = NULL;
- else
+ } else {
dst_if = bridge_rtlookup(sc, eh->ether_dhost, vlan);
+ }
if (dst_if == NULL) {
struct bridge_iflist *bif;
struct mbuf *mc;
- int error = 0, used = 0;
+ int used = 0;
+ errno_t error;
+
bridge_span(sc, m);
BRIDGE_LOCK2REF(sc, error);
- if (error) {
+ if (error != 0) {
m_freem(m);
- return (0);
+ return error;
}
TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
+ /* skip interface with inactive link status */
+ if ((bif->bif_flags & BIFF_MEDIA_ACTIVE) == 0) {
+ continue;
+ }
dst_if = bif->bif_ifp;
- if (dst_if->if_type == IFT_GIF)
+ if (dst_if->if_type == IFT_GIF) {
continue;
- if ((dst_if->if_flags & IFF_RUNNING) == 0)
+ }
+ if ((dst_if->if_flags & IFF_RUNNING) == 0) {
continue;
+ }
/*
* If this is not the original output interface,
* allows forwarding.
*/
if (dst_if != ifp && (bif->bif_ifflags & IFBIF_STP) &&
- bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
+ bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
continue;
-
- if (LIST_NEXT(bif, bif_next) == NULL) {
+ }
+ if (TAILQ_NEXT(bif, bif_next) == NULL) {
used = 1;
mc = m;
} else {
- mc = m_copypacket(m, M_DONTWAIT);
+ mc = m_dup(m, M_DONTWAIT);
if (mc == NULL) {
(void) ifnet_stat_increment_out(
- sc->sc_ifp, 0, 0, 1);
+ sc->sc_ifp, 0, 0, 1);
continue;
}
}
-
- (void) bridge_enqueue(sc, dst_if, mc);
+ (void) bridge_enqueue(sc, ifp, dst_if, mc,
+ kChecksumOperationCompute);
}
- if (used == 0)
+ if (used == 0) {
m_freem(m);
+ }
BRIDGE_UNREF(sc);
- return (0);
+ return EJUSTRETURN;
}
sendunicast:
if ((dst_if->if_flags & IFF_RUNNING) == 0) {
m_freem(m);
BRIDGE_UNLOCK(sc);
- return (0);
+ return EJUSTRETURN;
}
BRIDGE_UNLOCK(sc);
- (void) bridge_enqueue(sc, dst_if, m);
- return (0);
+ if (dst_if == ifp) {
+ /* just let the packet continue on its way */
+ return 0;
+ }
+ (void) bridge_enqueue(sc, ifp, dst_if, m,
+ kChecksumOperationCompute);
+ return EJUSTRETURN;
}
-#endif /* BRIDGE_MEMBER_OUT_FILTER */
/*
* Output callback.
dst_if = NULL;
BRIDGE_LOCK(sc);
- if (!(m->m_flags & (M_BCAST|M_MCAST)))
+
+ if (!(m->m_flags & (M_BCAST | M_MCAST))) {
dst_if = bridge_rtlookup(sc, eh->ether_dhost, 0);
+ }
(void) ifnet_stat_increment_out(ifp, 1, m->m_pkthdr.len, 0);
#if NBPFILTER > 0
- if (sc->sc_bpf_output)
+ if (sc->sc_bpf_output) {
bridge_bpf_output(ifp, m);
+ }
#endif
if (dst_if == NULL) {
/* callee will unlock */
- bridge_broadcast(sc, ifp, m, 0);
+ bridge_broadcast(sc, NULL, m, 0);
} else {
BRIDGE_UNLOCK(sc);
- error = bridge_enqueue(sc, dst_if, m);
+ error = bridge_enqueue(sc, NULL, dst_if, m,
+ kChecksumOperationFinalize);
}
- return (error);
+ return error;
}
static void
struct ether_header *eh = mtod(m, struct ether_header *);
uint32_t sw_csum, hwcap;
- if (ifp != NULL)
+
+ if (ifp != NULL) {
hwcap = (ifp->if_hwassist | CSUM_DATA_VALID);
- else
+ } else {
hwcap = 0;
+ }
/* do in software what the hardware cannot */
sw_csum = m->m_pkthdr.csum_flags & ~IF_HWASSIST_CSUM_FLAGS(hwcap);
(m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)) {
if (m->m_pkthdr.csum_flags & CSUM_TCP) {
uint16_t start =
- sizeof (*eh) + sizeof (struct ip);
+ sizeof(*eh) + sizeof(struct ip);
uint16_t ulpoff =
m->m_pkthdr.csum_data & 0xffff;
m->m_pkthdr.csum_flags |=
m->m_pkthdr.csum_flags);
}
}
- (void) in_finalize_cksum(m, sizeof (*eh), sw_csum);
+ (void) in_finalize_cksum(m, sizeof(*eh), sw_csum);
break;
#if INET6
(m->m_pkthdr.csum_flags & CSUM_DELAY_IPV6_DATA)) {
if (m->m_pkthdr.csum_flags & CSUM_TCPIPV6) {
uint16_t start =
- sizeof (*eh) + sizeof (struct ip6_hdr);
+ sizeof(*eh) + sizeof(struct ip6_hdr);
uint16_t ulpoff =
m->m_pkthdr.csum_data & 0xffff;
m->m_pkthdr.csum_flags |=
m->m_pkthdr.csum_flags);
}
}
- (void) in6_finalize_cksum(m, sizeof (*eh), -1, -1, sw_csum);
+ (void) in6_finalize_cksum(m, sizeof(*eh), -1, -1, sw_csum);
break;
#endif /* INET6 */
}
struct mbuf *m;
for (;;) {
- if (ifnet_dequeue(ifp, &m) != 0)
+ if (ifnet_dequeue(ifp, &m) != 0) {
break;
+ }
(void) bridge_output(ifp, m);
}
*/
static void
bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
- struct mbuf *m)
+ struct mbuf *m)
{
struct bridge_iflist *dbif;
struct ifnet *src_if, *dst_if, *ifp;
BRIDGE_LOCK_ASSERT_HELD(sc);
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_OUTPPUT)
+ if (if_bridge_debug & BR_DBGF_OUTPUT) {
printf("%s: %s m 0x%llx\n", __func__, sc->sc_ifp->if_xname,
(uint64_t)VM_KERNEL_ADDRPERM(m));
+ }
#endif /* BRIDGE_DEBUG */
src_if = m->m_pkthdr.rcvif;
if ((sbif->bif_ifflags & IFBIF_STP) &&
- sbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
+ sbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
goto drop;
+ }
eh = mtod(m, struct ether_header *);
dst = eh->ether_dhost;
* If the interface has addresses limits then deny any source
* that is not in the cache.
*/
- if (error && sbif->bif_addrmax)
+ if (error && sbif->bif_addrmax) {
goto drop;
+ }
}
if ((sbif->bif_ifflags & IFBIF_STP) != 0 &&
- sbif->bif_stp.bp_state == BSTP_IFSTATE_LEARNING)
+ sbif->bif_stp.bp_state == BSTP_IFSTATE_LEARNING) {
goto drop;
+ }
/*
* At this point, the port either doesn't participate
* If the packet is unicast, destined for someone on
* "this" side of the bridge, drop it.
*/
- if ((m->m_flags & (M_BCAST|M_MCAST)) == 0) {
+ if ((m->m_flags & (M_BCAST | M_MCAST)) == 0) {
+ /* unicast */
dst_if = bridge_rtlookup(sc, dst, vlan);
- if (src_if == dst_if)
+ if (src_if == dst_if) {
goto drop;
+ }
} else {
+ /* broadcast/multicast */
+
/*
* Check if its a reserved multicast address, any address
* listed in 802.1D section 7.12.6 may not be forwarded by the
*/
if (dst[0] == 0x01 && dst[1] == 0x80 &&
dst[2] == 0xc2 && dst[3] == 0x00 &&
- dst[4] == 0x00 && dst[5] <= 0x0f)
+ dst[4] == 0x00 && dst[5] <= 0x0f) {
goto drop;
+ }
/* ...forward it to all interfaces. */
if (eh->ether_type == htons(ETHERTYPE_RSN_PREAUTH) ||
dst_if != NULL || (m->m_flags & (M_BCAST | M_MCAST)) == 0) {
m->m_pkthdr.rcvif = ifp;
- if (sc->sc_bpf_input)
+ if (sc->sc_bpf_input) {
bridge_bpf_input(ifp, m);
+ }
}
#endif /* NBPFILTER */
/* run the packet filter */
if (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6) {
BRIDGE_UNLOCK(sc);
- if (bridge_pfil(&m, ifp, src_if, PFIL_IN) != 0)
+ if (bridge_pfil(&m, ifp, src_if, PFIL_IN) != 0) {
return;
- if (m == NULL)
+ }
+ if (m == NULL) {
return;
+ }
BRIDGE_LOCK(sc);
}
#endif /* PFIL_HOOKS */
return;
}
+ /*
+ * Unicast.
+ */
/*
* At this point, we're dealing with a unicast frame
* going to a different interface.
*/
- if ((dst_if->if_flags & IFF_RUNNING) == 0)
+ if ((dst_if->if_flags & IFF_RUNNING) == 0) {
goto drop;
+ }
dbif = bridge_lookup_member_if(sc, dst_if);
- if (dbif == NULL)
+ if (dbif == NULL) {
/* Not a member of the bridge (anymore?) */
goto drop;
+ }
/* Private segments can not talk to each other */
- if (sbif->bif_ifflags & dbif->bif_ifflags & IFBIF_PRIVATE)
+ if (sbif->bif_ifflags & dbif->bif_ifflags & IFBIF_PRIVATE) {
goto drop;
+ }
if ((dbif->bif_ifflags & IFBIF_STP) &&
- dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
+ dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
goto drop;
+ }
#if HAS_DHCPRA_MASK
/* APPLE MODIFICATION <rdar:6985737> */
#if defined(PFIL_HOOKS)
if (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6) {
- if (bridge_pfil(&m, ifp, dst_if, PFIL_OUT) != 0)
+ if (bridge_pfil(&m, ifp, dst_if, PFIL_OUT) != 0) {
return;
- if (m == NULL)
+ }
+ if (m == NULL) {
return;
+ }
}
#endif /* PFIL_HOOKS */
- (void) bridge_enqueue(sc, dst_if, m);
+ /*
+ * This is an inbound packet where the checksum
+ * (if applicable) is already present/valid. Since
+ * we are just doing layer 2 forwarding (not IP
+ * forwarding), there's no need to validate the checksum.
+ * Clear the checksum offload flags and send it along.
+ */
+ (void) bridge_enqueue(sc, NULL, dst_if, m, kChecksumOperationClear);
return;
drop:
snprintf(buf, len, "%02x:%02x:%02x:%02x:%02x:%02x",
ap[0], ap[1], ap[2], ap[3], ap[4], ap[5]);
- return (buf);
+ return buf;
}
#endif /* BRIDGE_DEBUG */
int error;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_INPUT)
+ if (if_bridge_debug & BR_DBGF_INPUT) {
printf("%s: %s from %s m 0x%llx data 0x%llx\n", __func__,
sc->sc_ifp->if_xname, ifp->if_xname,
(uint64_t)VM_KERNEL_ADDRPERM(m),
(uint64_t)VM_KERNEL_ADDRPERM(mbuf_data(m)));
+ }
#endif /* BRIDGE_DEBUG */
if ((sc->sc_ifp->if_flags & IFF_RUNNING) == 0) {
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_INPUT)
+ if (if_bridge_debug & BR_DBGF_INPUT) {
printf("%s: %s not running passing along\n",
__func__, sc->sc_ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
- return (0);
+ return 0;
}
bifp = sc->sc_ifp;
BRIDGE_BPF_MTAP_INPUT(sc, m);
(void) ifnet_stat_increment_in(bifp, 1, m->m_pkthdr.len, 0);
m_freem(m);
- return (EJUSTRETURN);
+ return EJUSTRETURN;
}
#endif /* IFF_MONITOR */
* Need to clear the promiscous flags otherwise it will be
* dropped by DLIL after processing filters
*/
- if ((mbuf_flags(m) & MBUF_PROMISC))
+ if ((mbuf_flags(m) & MBUF_PROMISC)) {
mbuf_setflags_mask(m, 0, MBUF_PROMISC);
+ }
BRIDGE_LOCK(sc);
bif = bridge_lookup_member_if(sc, ifp);
if (bif == NULL) {
BRIDGE_UNLOCK(sc);
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_INPUT)
+ if (if_bridge_debug & BR_DBGF_INPUT) {
printf("%s: %s bridge_lookup_member_if failed\n",
__func__, sc->sc_ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
- return (0);
+ return 0;
}
if (bif->bif_flags & BIFF_HOST_FILTER) {
error = bridge_host_filter(bif, m);
if (error != 0) {
- if (if_bridge_debug & BR_DBGF_INPUT)
+ if (if_bridge_debug & BR_DBGF_INPUT) {
printf("%s: %s bridge_host_filter failed\n",
__func__, bif->bif_ifp->if_xname);
+ }
BRIDGE_UNLOCK(sc);
- return (EJUSTRETURN);
+ return EJUSTRETURN;
}
}
bridge_span(sc, m);
- if (m->m_flags & (M_BCAST|M_MCAST)) {
-
+ if (m->m_flags & (M_BCAST | M_MCAST)) {
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_MCAST)
- if ((m->m_flags & M_MCAST))
+ if (if_bridge_debug & BR_DBGF_MCAST) {
+ if ((m->m_flags & M_MCAST)) {
printf("%s: multicast: "
"%02x:%02x:%02x:%02x:%02x:%02x\n",
__func__,
eh->ether_dhost[0], eh->ether_dhost[1],
eh->ether_dhost[2], eh->ether_dhost[3],
eh->ether_dhost[4], eh->ether_dhost[5]);
+ }
+ }
#endif /* BRIDGE_DEBUG */
/* Tap off 802.1D packets; they do not get forwarded. */
#endif /* !BRIDGESTP */
if (m == NULL) {
BRIDGE_UNLOCK(sc);
- return (EJUSTRETURN);
+ return EJUSTRETURN;
}
}
if ((bif->bif_ifflags & IFBIF_STP) &&
bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
BRIDGE_UNLOCK(sc);
- return (0);
+ return 0;
}
/*
mc = m_dup(m, M_DONTWAIT);
if (mc == NULL) {
BRIDGE_UNLOCK(sc);
- return (0);
+ return 0;
}
/*
mc2->m_pkthdr.pkt_hdr = mbuf_data(mc2);
#if NBPFILTER > 0
- if (sc->sc_bpf_input)
+ if (sc->sc_bpf_input) {
bridge_bpf_input(bifp, mc2);
+ }
#endif /* NBPFILTER */
(void) mbuf_setdata(mc2,
(char *)mbuf_data(mc2) + ETHER_HDR_LEN,
mbuf_len(mc2) - ETHER_HDR_LEN);
- (void) mbuf_pkthdr_adjustlen(mc2, - ETHER_HDR_LEN);
+ (void) mbuf_pkthdr_adjustlen(mc2, -ETHER_HDR_LEN);
(void) ifnet_stat_increment_in(bifp, 1,
mbuf_pkthdr_len(mc2), 0);
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_MCAST)
+ if (if_bridge_debug & BR_DBGF_MCAST) {
printf("%s: %s mcast for us\n", __func__,
sc->sc_ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
dlil_input_packet_list(bifp, mc2);
}
/* Return the original packet for local processing. */
- return (0);
+ return 0;
}
if ((bif->bif_ifflags & IFBIF_STP) &&
bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
BRIDGE_UNLOCK(sc);
- return (0);
+ return 0;
}
#ifdef DEV_CARP
-#define CARP_CHECK_WE_ARE_DST(iface) \
+#define CARP_CHECK_WE_ARE_DST(iface) \
((iface)->if_carp &&\
- carp_forus((iface)->if_carp, eh->ether_dhost))
-#define CARP_CHECK_WE_ARE_SRC(iface) \
+ carp_forus((iface)->if_carp, eh->ether_dhost))
+#define CARP_CHECK_WE_ARE_SRC(iface) \
((iface)->if_carp &&\
- carp_forus((iface)->if_carp, eh->ether_shost))
+ carp_forus((iface)->if_carp, eh->ether_shost))
#else
-#define CARP_CHECK_WE_ARE_DST(iface) 0
-#define CARP_CHECK_WE_ARE_SRC(iface) 0
+#define CARP_CHECK_WE_ARE_DST(iface) 0
+#define CARP_CHECK_WE_ARE_SRC(iface) 0
#endif
#ifdef INET6
-#define PFIL_HOOKED_INET6 PFIL_HOOKED(&inet6_pfil_hook)
+#define PFIL_HOOKED_INET6 PFIL_HOOKED(&inet6_pfil_hook)
#else
-#define PFIL_HOOKED_INET6 0
+#define PFIL_HOOKED_INET6 0
#endif
#if defined(PFIL_HOOKS)
-#define PFIL_PHYS(sc, ifp, m) do { \
- if (pfil_local_phys && \
- (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6)) { \
- if (bridge_pfil(&m, NULL, ifp, \
- PFIL_IN) != 0 || m == NULL) { \
- BRIDGE_UNLOCK(sc); \
- return (NULL); \
- } \
- } \
+#define PFIL_PHYS(sc, ifp, m) do { \
+ if (pfil_local_phys && \
+ (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6)) { \
+ if (bridge_pfil(&m, NULL, ifp, \
+ PFIL_IN) != 0 || m == NULL) { \
+ BRIDGE_UNLOCK(sc); \
+ return (NULL); \
+ } \
+ } \
} while (0)
#else /* PFIL_HOOKS */
-#define PFIL_PHYS(sc, ifp, m)
+#define PFIL_PHYS(sc, ifp, m)
#endif /* PFIL_HOOKS */
-#define GRAB_OUR_PACKETS(iface) \
- if ((iface)->if_type == IFT_GIF) \
- continue; \
- /* It is destined for us. */ \
- if (memcmp(IF_LLADDR((iface)), eh->ether_dhost, \
- ETHER_ADDR_LEN) == 0 || CARP_CHECK_WE_ARE_DST((iface))) { \
- if ((iface)->if_type == IFT_BRIDGE) { \
- BRIDGE_BPF_MTAP_INPUT(sc, m); \
- /* Filter on the physical interface. */ \
- PFIL_PHYS(sc, iface, m); \
- } \
- if (bif->bif_ifflags & IFBIF_LEARNING) { \
- error = bridge_rtupdate(sc, eh->ether_shost, \
- vlan, bif, 0, IFBAF_DYNAMIC); \
- if (error && bif->bif_addrmax) { \
- BRIDGE_UNLOCK(sc); \
- return (EJUSTRETURN); \
- } \
- } \
- m->m_pkthdr.rcvif = iface; \
- BRIDGE_UNLOCK(sc); \
- return (0); \
- } \
- \
- /* We just received a packet that we sent out. */ \
- if (memcmp(IF_LLADDR((iface)), eh->ether_shost, \
- ETHER_ADDR_LEN) == 0 || CARP_CHECK_WE_ARE_SRC((iface))) { \
- BRIDGE_UNLOCK(sc); \
- return (EJUSTRETURN); \
+#define GRAB_OUR_PACKETS(iface) \
+ if ((iface)->if_type == IFT_GIF) \
+ continue; \
+ /* It is destined for us. */ \
+ if (memcmp(IF_LLADDR((iface)), eh->ether_dhost, \
+ ETHER_ADDR_LEN) == 0 || CARP_CHECK_WE_ARE_DST((iface))) { \
+ if ((iface)->if_type == IFT_BRIDGE) { \
+ BRIDGE_BPF_MTAP_INPUT(sc, m); \
+ /* Filter on the physical interface. */ \
+ PFIL_PHYS(sc, iface, m); \
+ } else { \
+ bpf_tap_in(iface, DLT_EN10MB, m, NULL, 0); \
+ } \
+ if (bif->bif_ifflags & IFBIF_LEARNING) { \
+ error = bridge_rtupdate(sc, eh->ether_shost, \
+ vlan, bif, 0, IFBAF_DYNAMIC); \
+ if (error && bif->bif_addrmax) { \
+ BRIDGE_UNLOCK(sc); \
+ m_freem(m); \
+ return (EJUSTRETURN); \
+ } \
+ } \
+ BRIDGE_UNLOCK(sc); \
+ mbuf_pkthdr_setrcvif(m, iface); \
+ mbuf_pkthdr_setheader(m, mbuf_data(m)); \
+ mbuf_setdata(m, (char *)mbuf_data(m) + ETHER_HDR_LEN, \
+ mbuf_len(m) - ETHER_HDR_LEN); \
+ mbuf_pkthdr_adjustlen(m, -ETHER_HDR_LEN); \
+ m->m_flags |= M_PROTO1; /* set to avoid loops */ \
+ dlil_input_packet_list(iface, m); \
+ return (EJUSTRETURN); \
+ } \
+ \
+ /* We just received a packet that we sent out. */ \
+ if (memcmp(IF_LLADDR((iface)), eh->ether_shost, \
+ ETHER_ADDR_LEN) == 0 || CARP_CHECK_WE_ARE_SRC((iface))) { \
+ BRIDGE_UNLOCK(sc); \
+ m_freem(m); \
+ return (EJUSTRETURN); \
}
/*
*/
if (memcmp(eh->ether_dhost, IF_LLADDR(bifp),
ETHER_ADDR_LEN) == 0 || CARP_CHECK_WE_ARE_DST(bifp)) {
-
/* Mark the packet as arriving on the bridge interface */
(void) mbuf_pkthdr_setrcvif(m, bifp);
mbuf_pkthdr_setheader(m, frame_header);
* address is valid and not multicast, record
* the address.
*/
- if (bif->bif_ifflags & IFBIF_LEARNING)
+ if (bif->bif_ifflags & IFBIF_LEARNING) {
(void) bridge_rtupdate(sc, eh->ether_shost,
vlan, bif, 0, IFBAF_DYNAMIC);
+ }
BRIDGE_BPF_MTAP_INPUT(sc, m);
(void) mbuf_setdata(m, (char *)mbuf_data(m) + ETHER_HDR_LEN,
mbuf_len(m) - ETHER_HDR_LEN);
- (void) mbuf_pkthdr_adjustlen(m, - ETHER_HDR_LEN);
+ (void) mbuf_pkthdr_adjustlen(m, -ETHER_HDR_LEN);
(void) ifnet_stat_increment_in(bifp, 1, mbuf_pkthdr_len(m), 0);
BRIDGE_UNLOCK(sc);
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_INPUT)
+ if (if_bridge_debug & BR_DBGF_INPUT) {
printf("%s: %s packet for bridge\n", __func__,
sc->sc_ifp->if_xname);
+ }
#endif /* BRIDGE_DEBUG */
dlil_input_packet_list(bifp, m);
- return (EJUSTRETURN);
+ return EJUSTRETURN;
}
/*
if (memcmp(eh->ether_dhost, IF_LLADDR(ifp), ETHER_ADDR_LEN) == 0) {
#ifdef VERY_VERY_VERY_DIAGNOSTIC
- printf("%s: not forwarding packet bound for member "
- "interface\n", __func__);
+ printf("%s: not forwarding packet bound for member "
+ "interface\n", __func__);
#endif
- BRIDGE_UNLOCK(sc);
- return (0);
+
+ BRIDGE_UNLOCK(sc);
+ return 0;
}
- /* Now check the all bridge members. */
+ /* Now check the remaining bridge members. */
TAILQ_FOREACH(bif2, &sc->sc_iflist, bif_next) {
- GRAB_OUR_PACKETS(bif2->bif_ifp)
+ if (bif2->bif_ifp != ifp) {
+ GRAB_OUR_PACKETS(bif2->bif_ifp);
+ }
}
#undef CARP_CHECK_WE_ARE_DST
*/
bridge_forward(sc, bif, m);
- return (EJUSTRETURN);
+ return EJUSTRETURN;
}
/*
*/
static void
bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
- struct mbuf *m, int runfilt)
+ struct mbuf *m, int runfilt)
{
#ifndef PFIL_HOOKS
#pragma unused(runfilt)
#endif
struct bridge_iflist *dbif, *sbif;
struct mbuf *mc;
+ struct mbuf *mc_in;
struct ifnet *dst_if;
int error = 0, used = 0;
+ boolean_t is_output;
+ ChecksumOperation cksum_op;
- sbif = bridge_lookup_member_if(sc, src_if);
+ if (src_if != NULL) {
+ is_output = FALSE;
+ cksum_op = kChecksumOperationClear;
+ sbif = bridge_lookup_member_if(sc, src_if);
+ } else {
+ /*
+ * src_if is NULL when the bridge interface calls
+ * bridge_broadcast().
+ */
+ is_output = TRUE;
+ cksum_op = kChecksumOperationFinalize;
+ sbif = NULL;
+ }
BRIDGE_LOCK2REF(sc, error);
if (error) {
#ifdef PFIL_HOOKS
/* Filter on the bridge interface before broadcasting */
if (runfilt && (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6)) {
- if (bridge_pfil(&m, sc->sc_ifp, NULL, PFIL_OUT) != 0)
+ if (bridge_pfil(&m, sc->sc_ifp, NULL, PFIL_OUT) != 0) {
goto out;
- if (m == NULL)
+ }
+ if (m == NULL) {
goto out;
+ }
}
#endif /* PFIL_HOOKS */
TAILQ_FOREACH(dbif, &sc->sc_iflist, bif_next) {
dst_if = dbif->bif_ifp;
- if (dst_if == src_if)
+ if (dst_if == src_if) {
+ /* skip the interface that the packet came in on */
continue;
+ }
/* Private segments can not talk to each other */
- if (sbif &&
- (sbif->bif_ifflags & dbif->bif_ifflags & IFBIF_PRIVATE))
+ if (sbif != NULL &&
+ (sbif->bif_ifflags & dbif->bif_ifflags & IFBIF_PRIVATE)) {
continue;
+ }
if ((dbif->bif_ifflags & IFBIF_STP) &&
- dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
+ dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
continue;
+ }
if ((dbif->bif_ifflags & IFBIF_DISCOVER) == 0 &&
- (m->m_flags & (M_BCAST|M_MCAST)) == 0)
+ (m->m_flags & (M_BCAST | M_MCAST)) == 0) {
continue;
+ }
- if ((dst_if->if_flags & IFF_RUNNING) == 0)
+ if ((dst_if->if_flags & IFF_RUNNING) == 0) {
continue;
+ }
if (!(dbif->bif_flags & BIFF_MEDIA_ACTIVE)) {
continue;
}
}
+ /*
+ * If broadcast input is enabled, do so only if this
+ * is an input packet.
+ */
+ if (!is_output &&
+ (dbif->bif_flags & BIFF_INPUT_BROADCAST) != 0) {
+ mc_in = m_dup(mc, M_DONTWAIT);
+ /* this could fail, but we continue anyways */
+ } else {
+ mc_in = NULL;
+ }
+
#ifdef PFIL_HOOKS
/*
* Filter on the output interface. Pass a NULL bridge interface
mc = m_copyup(mc, i, ETHER_ALIGN);
if (mc == NULL) {
(void) ifnet_stat_increment_out(
- sc->sc_ifp, 0, 0, 1);
+ sc->sc_ifp, 0, 0, 1);
+ if (mc_in != NULL) {
+ m_freem(mc_in);
+ }
continue;
}
}
- if (bridge_pfil(&mc, NULL, dst_if, PFIL_OUT) != 0)
+ if (bridge_pfil(&mc, NULL, dst_if, PFIL_OUT) != 0) {
+ if (mc_in != NULL) {
+ m_freem(mc_in);
+ }
continue;
- if (mc == NULL)
+ }
+ if (mc == NULL) {
+ if (mc_in != NULL) {
+ m_freem(mc_in);
+ }
continue;
+ }
}
#endif /* PFIL_HOOKS */
- (void) bridge_enqueue(sc, dst_if, mc);
- }
- if (used == 0)
+ /* out */
+ (void) bridge_enqueue(sc, NULL, dst_if, mc, cksum_op);
+
+ /* in */
+ if (mc_in == NULL) {
+ continue;
+ }
+ bpf_tap_in(dst_if, DLT_EN10MB, mc_in, NULL, 0);
+ mbuf_pkthdr_setrcvif(mc_in, dst_if);
+ mbuf_pkthdr_setheader(mc_in, mbuf_data(mc_in));
+ mbuf_setdata(mc_in, (char *)mbuf_data(mc_in) + ETHER_HDR_LEN,
+ mbuf_len(mc_in) - ETHER_HDR_LEN);
+ mbuf_pkthdr_adjustlen(mc_in, -ETHER_HDR_LEN);
+ mc_in->m_flags |= M_PROTO1; /* set to avoid loops */
+ dlil_input_packet_list(dst_if, mc_in);
+ }
+ if (used == 0) {
m_freem(m);
+ }
#ifdef PFIL_HOOKS
out:
struct ifnet *dst_if;
struct mbuf *mc;
- if (TAILQ_EMPTY(&sc->sc_spanlist))
+ if (TAILQ_EMPTY(&sc->sc_spanlist)) {
return;
+ }
TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next) {
dst_if = bif->bif_ifp;
- if ((dst_if->if_flags & IFF_RUNNING) == 0)
+ if ((dst_if->if_flags & IFF_RUNNING) == 0) {
continue;
+ }
mc = m_copypacket(m, M_DONTWAIT);
if (mc == NULL) {
continue;
}
- (void) bridge_enqueue(sc, dst_if, mc);
+ (void) bridge_enqueue(sc, NULL, dst_if, mc,
+ kChecksumOperationNone);
}
}
*/
static int
bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan,
- struct bridge_iflist *bif, int setflags, uint8_t flags)
+ struct bridge_iflist *bif, int setflags, uint8_t flags)
{
struct bridge_rtnode *brt;
int error;
/* Check the source address is valid and not multicast. */
if (ETHER_IS_MULTICAST(dst) ||
(dst[0] == 0 && dst[1] == 0 && dst[2] == 0 &&
- dst[3] == 0 && dst[4] == 0 && dst[5] == 0) != 0)
- return (EINVAL);
+ dst[3] == 0 && dst[4] == 0 && dst[5] == 0) != 0) {
+ return EINVAL;
+ }
/* 802.1p frames map to vlan 1 */
- if (vlan == 0)
+ if (vlan == 0) {
vlan = 1;
+ }
/*
* A route for this destination might already exist. If so,
if ((brt = bridge_rtnode_lookup(sc, dst, vlan)) == NULL) {
if (sc->sc_brtcnt >= sc->sc_brtmax) {
sc->sc_brtexceeded++;
- return (ENOSPC);
+ return ENOSPC;
}
/* Check per interface address limits (if enabled) */
if (bif->bif_addrmax && bif->bif_addrcnt >= bif->bif_addrmax) {
bif->bif_addrexceeded++;
- return (ENOSPC);
+ return ENOSPC;
}
/*
* address.
*/
brt = zalloc_noblock(bridge_rtnode_pool);
- if (brt == NULL)
- return (ENOMEM);
+ if (brt == NULL) {
+ return ENOMEM;
+ }
bzero(brt, sizeof(struct bridge_rtnode));
- if (bif->bif_ifflags & IFBIF_STICKY)
+ if (bif->bif_ifflags & IFBIF_STICKY) {
brt->brt_flags = IFBAF_STICKY;
- else
+ } else {
brt->brt_flags = IFBAF_DYNAMIC;
+ }
memcpy(brt->brt_addr, dst, ETHER_ADDR_LEN);
brt->brt_vlan = vlan;
if ((error = bridge_rtnode_insert(sc, brt)) != 0) {
zfree(bridge_rtnode_pool, brt);
- return (error);
+ return error;
}
brt->brt_dst = bif;
bif->bif_addrcnt++;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_RT_TABLE)
+ if (if_bridge_debug & BR_DBGF_RT_TABLE) {
printf("%s: added %02x:%02x:%02x:%02x:%02x:%02x "
"on %s count %u hashsize %u\n", __func__,
dst[0], dst[1], dst[2], dst[3], dst[4], dst[5],
sc->sc_ifp->if_xname, sc->sc_brtcnt,
sc->sc_rthash_size);
+ }
#endif
}
now = (unsigned long) net_uptime();
brt->brt_expire = now + sc->sc_brttimeout;
}
- if (setflags)
+ if (setflags) {
brt->brt_flags = flags;
+ }
- return (0);
+ return 0;
}
/*
BRIDGE_LOCK_ASSERT_HELD(sc);
- if ((brt = bridge_rtnode_lookup(sc, addr, vlan)) == NULL)
- return (NULL);
+ if ((brt = bridge_rtnode_lookup(sc, addr, vlan)) == NULL) {
+ return NULL;
+ }
- return (brt->brt_ifp);
+ return brt->brt_ifp;
}
/*
BRIDGE_LOCK_ASSERT_HELD(sc);
/* Make sure we actually need to do this. */
- if (sc->sc_brtcnt <= sc->sc_brtmax)
+ if (sc->sc_brtcnt <= sc->sc_brtmax) {
return;
+ }
/* Force an aging cycle; this might trim enough addresses. */
bridge_rtage(sc);
- if (sc->sc_brtcnt <= sc->sc_brtmax)
+ if (sc->sc_brtcnt <= sc->sc_brtmax) {
return;
+ }
LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
bridge_rtnode_destroy(sc, brt);
- if (sc->sc_brtcnt <= sc->sc_brtmax)
+ if (sc->sc_brtcnt <= sc->sc_brtmax) {
return;
+ }
}
}
}
LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
- if (now >= brt->brt_expire)
+ if (now >= brt->brt_expire) {
bridge_rtnode_destroy(sc, brt);
+ }
}
}
}
BRIDGE_LOCK_ASSERT_HELD(sc);
LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
- if (full || (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC)
+ if (full || (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
bridge_rtnode_destroy(sc, brt);
+ }
}
}
found = 1;
}
- return (found ? 0 : ENOENT);
+ return found ? 0 : ENOENT;
}
/*
LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
if (brt->brt_ifp == ifp && (full ||
- (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC))
+ (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC)) {
bridge_rtnode_destroy(sc, brt);
+ }
}
}
{
u_int32_t i;
- sc->sc_rthash = _MALLOC(sizeof (*sc->sc_rthash) * BRIDGE_RTHASH_SIZE,
+ sc->sc_rthash = _MALLOC(sizeof(*sc->sc_rthash) * BRIDGE_RTHASH_SIZE,
M_DEVBUF, M_WAITOK | M_ZERO);
if (sc->sc_rthash == NULL) {
printf("%s: no memory\n", __func__);
- return (ENOMEM);
+ return ENOMEM;
}
sc->sc_rthash_size = BRIDGE_RTHASH_SIZE;
- for (i = 0; i < sc->sc_rthash_size; i++)
+ for (i = 0; i < sc->sc_rthash_size; i++) {
LIST_INIT(&sc->sc_rthash[i]);
+ }
sc->sc_rthash_key = RandomULong();
LIST_INIT(&sc->sc_rtlist);
- return (0);
+ return 0;
}
/*
/*
* Four entries per hash bucket is our ideal load factor
*/
- if (sc->sc_brtcnt < sc->sc_rthash_size * 4)
+ if (sc->sc_brtcnt < sc->sc_rthash_size * 4) {
goto out;
+ }
/*
* Doubling the number of hash buckets may be too simplistic
sc->sc_flags |= SCF_RESIZING;
BRIDGE_UNLOCK(sc);
- new_rthash = _MALLOC(sizeof (*sc->sc_rthash) * new_rthash_size,
+ new_rthash = _MALLOC(sizeof(*sc->sc_rthash) * new_rthash_size,
M_DEVBUF, M_WAITOK | M_ZERO);
BRIDGE_LOCK(sc);
*/
sc->sc_rthash_key = RandomULong();
- for (i = 0; i < sc->sc_rthash_size; i++)
+ for (i = 0; i < sc->sc_rthash_size; i++) {
LIST_INIT(&sc->sc_rthash[i]);
+ }
- LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {
+ LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {
LIST_REMOVE(brt, brt_hash);
(void) bridge_rtnode_hash(sc, brt);
}
out:
if (error == 0) {
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_RT_TABLE)
+ if (if_bridge_debug & BR_DBGF_RT_TABLE) {
printf("%s: %s new size %u\n", __func__,
sc->sc_ifp->if_xname, sc->sc_rthash_size);
+ }
#endif /* BRIDGE_DEBUG */
- if (old_rthash)
+ if (old_rthash) {
_FREE(old_rthash, M_DEVBUF);
+ }
} else {
#if BRIDGE_DEBUG
printf("%s: %s failed %d\n", __func__,
sc->sc_ifp->if_xname, error);
#endif /* BRIDGE_DEBUG */
- if (new_rthash != NULL)
+ if (new_rthash != NULL) {
_FREE(new_rthash, M_DEVBUF);
+ }
}
}
{
BRIDGE_LOCK_ASSERT_HELD(sc);
- if ((sc->sc_flags & SCF_DETACHING) || (sc->sc_flags & SCF_RESIZING))
+ if ((sc->sc_flags & SCF_DETACHING) || (sc->sc_flags & SCF_RESIZING)) {
return;
+ }
/*
* Four entries per hash bucket is our ideal load factor
*/
- if (sc->sc_brtcnt < sc->sc_rthash_size * 4)
+ if (sc->sc_brtcnt < sc->sc_rthash_size * 4) {
return;
+ }
/*
* Hard limit on the size of the routing hash table
*/
- if (sc->sc_rthash_size >= bridge_rtable_hash_size_max)
+ if (sc->sc_rthash_size >= bridge_rtable_hash_size_max) {
return;
+ }
sc->sc_resize_call.bdc_sc = sc;
sc->sc_resize_call.bdc_func = bridge_rthash_delayed_resize;
* The following hash function is adapted from "Hash Functions" by Bob Jenkins
* ("Algorithm Alley", Dr. Dobbs Journal, September 1997).
*/
-#define mix(a, b, c) \
-do { \
- a -= b; a -= c; a ^= (c >> 13); \
- b -= c; b -= a; b ^= (a << 8); \
- c -= a; c -= b; c ^= (b >> 13); \
- a -= b; a -= c; a ^= (c >> 12); \
- b -= c; b -= a; b ^= (a << 16); \
- c -= a; c -= b; c ^= (b >> 5); \
- a -= b; a -= c; a ^= (c >> 3); \
- b -= c; b -= a; b ^= (a << 10); \
- c -= a; c -= b; c ^= (b >> 15); \
-} while (/*CONSTCOND*/0)
+#define mix(a, b, c) \
+do { \
+ a -= b; a -= c; a ^= (c >> 13); \
+ b -= c; b -= a; b ^= (a << 8); \
+ c -= a; c -= b; c ^= (b >> 13); \
+ a -= b; a -= c; a ^= (c >> 12); \
+ b -= c; b -= a; b ^= (a << 16); \
+ c -= a; c -= b; c ^= (b >> 5); \
+ a -= b; a -= c; a ^= (c >> 3); \
+ b -= c; b -= a; b ^= (a << 10); \
+ c -= a; c -= b; c ^= (b >> 15); \
+} while ( /*CONSTCOND*/ 0)
static __inline uint32_t
bridge_rthash(struct bridge_softc *sc, const uint8_t *addr)
mix(a, b, c);
- return (c & BRIDGE_RTHASH_MASK(sc));
+ return c & BRIDGE_RTHASH_MASK(sc);
}
#undef mix
d = ((int)a[i]) - ((int)b[i]);
}
- return (d);
+ return d;
}
/*
*/
static struct bridge_rtnode *
bridge_rtnode_lookup(struct bridge_softc *sc, const uint8_t *addr,
- uint16_t vlan)
+ uint16_t vlan)
{
struct bridge_rtnode *brt;
uint32_t hash;
hash = bridge_rthash(sc, addr);
LIST_FOREACH(brt, &sc->sc_rthash[hash], brt_hash) {
dir = bridge_rtnode_addr_cmp(addr, brt->brt_addr);
- if (dir == 0 && (brt->brt_vlan == vlan || vlan == 0))
- return (brt);
- if (dir > 0)
- return (NULL);
+ if (dir == 0 && (brt->brt_vlan == vlan || vlan == 0)) {
+ return brt;
+ }
+ if (dir > 0) {
+ return NULL;
+ }
}
- return (NULL);
+ return NULL;
}
/*
dir = bridge_rtnode_addr_cmp(brt->brt_addr, lbrt->brt_addr);
if (dir == 0 && brt->brt_vlan == lbrt->brt_vlan) {
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_RT_TABLE)
+ if (if_bridge_debug & BR_DBGF_RT_TABLE) {
printf("%s: %s EEXIST "
"%02x:%02x:%02x:%02x:%02x:%02x\n",
__func__, sc->sc_ifp->if_xname,
brt->brt_addr[0], brt->brt_addr[1],
brt->brt_addr[2], brt->brt_addr[3],
brt->brt_addr[4], brt->brt_addr[5]);
+ }
#endif
- return (EEXIST);
+ return EEXIST;
}
if (dir > 0) {
LIST_INSERT_BEFORE(lbrt, brt, brt_hash);
} while (lbrt != NULL);
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_RT_TABLE)
+ if (if_bridge_debug & BR_DBGF_RT_TABLE) {
printf("%s: %s impossible %02x:%02x:%02x:%02x:%02x:%02x\n",
__func__, sc->sc_ifp->if_xname,
brt->brt_addr[0], brt->brt_addr[1], brt->brt_addr[2],
brt->brt_addr[3], brt->brt_addr[4], brt->brt_addr[5]);
+ }
#endif
out:
- return (0);
+ return 0;
}
/*
int error;
error = bridge_rtnode_hash(sc, brt);
- if (error != 0)
- return (error);
+ if (error != 0) {
+ return error;
+ }
LIST_INSERT_HEAD(&sc->sc_rtlist, brt, brt_list);
sc->sc_brtcnt++;
bridge_rthash_resize(sc);
- return (0);
+ return 0;
}
/*
/* Cap the expiry time to 'age' */
if (brt->brt_ifp == ifp &&
brt->brt_expire > now + age &&
- (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC)
+ (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
brt->brt_expire = now + age;
+ }
}
}
BRIDGE_UNLOCK(sc);
"discarding"
};
- if (log_stp)
+ if (log_stp) {
log(LOG_NOTICE, "%s: state changed to %s on %s\n",
sc->sc_ifp->if_xname,
stpstates[state], ifp->if_xname);
+ }
}
#endif /* BRIDGESTP */
u_int16_t ether_type;
snap = 0;
- error = -1; /* Default error if not error == 0 */
+ error = -1; /* Default error if not error == 0 */
#if 0
/* we may return with the IP fields swapped, ensure its not shared */
KASSERT(M_WRITABLE(*mp), ("%s: modifying a shared mbuf", __func__));
#endif
- if (pfil_bridge == 0 && pfil_member == 0 && pfil_ipfw == 0)
- return (0); /* filtering is disabled */
-
+ if (pfil_bridge == 0 && pfil_member == 0 && pfil_ipfw == 0) {
+ return 0; /* filtering is disabled */
+ }
i = min((*mp)->m_pkthdr.len, max_protohdr);
if ((*mp)->m_len < i) {
*mp = m_pullup(*mp, i);
if (*mp == NULL) {
printf("%s: m_pullup failed\n", __func__);
- return (-1);
+ return -1;
}
}
* ARP traffic.)
*/
switch (ether_type) {
- case ETHERTYPE_ARP:
- case ETHERTYPE_REVARP:
- if (pfil_ipfw_arp == 0)
- return (0); /* Automatically pass */
- break;
+ case ETHERTYPE_ARP:
+ case ETHERTYPE_REVARP:
+ if (pfil_ipfw_arp == 0) {
+ return 0; /* Automatically pass */
+ }
+ break;
- case ETHERTYPE_IP:
+ case ETHERTYPE_IP:
#if INET6
- case ETHERTYPE_IPV6:
+ case ETHERTYPE_IPV6:
#endif /* INET6 */
- break;
- default:
- /*
- * Check to see if the user wants to pass non-ip
- * packets, these will not be checked by pfil(9) and
- * passed unconditionally so the default is to drop.
- */
- if (pfil_onlyip)
- goto bad;
+ break;
+ default:
+ /*
+ * Check to see if the user wants to pass non-ip
+ * packets, these will not be checked by pfil(9) and
+ * passed unconditionally so the default is to drop.
+ */
+ if (pfil_onlyip) {
+ goto bad;
+ }
}
/* Strip off the Ethernet header and keep a copy. */
/* Strip off snap header, if present */
if (snap) {
- m_copydata(*mp, 0, sizeof (struct llc), (caddr_t)&llc1);
- m_adj(*mp, sizeof (struct llc));
+ m_copydata(*mp, 0, sizeof(struct llc), (caddr_t)&llc1);
+ m_adj(*mp, sizeof(struct llc));
}
/*
*/
if (dir == PFIL_IN) {
switch (ether_type) {
- case ETHERTYPE_IP:
- error = bridge_ip_checkbasic(mp);
- break;
+ case ETHERTYPE_IP:
+ error = bridge_ip_checkbasic(mp);
+ break;
#if INET6
- case ETHERTYPE_IPV6:
- error = bridge_ip6_checkbasic(mp);
- break;
+ case ETHERTYPE_IPV6:
+ error = bridge_ip6_checkbasic(mp);
+ break;
#endif /* INET6 */
- default:
- error = 0;
+ default:
+ error = 0;
}
- if (error)
+ if (error) {
goto bad;
+ }
}
if (IPFW_LOADED && pfil_ipfw != 0 && dir == PFIL_OUT && ifp != NULL) {
error = -1;
args.rule = ip_dn_claim_rule(*mp);
- if (args.rule != NULL && fw_one_pass)
+ if (args.rule != NULL && fw_one_pass) {
goto ipfwpass; /* packet already partially processed */
-
+ }
args.m = *mp;
args.oif = ifp;
args.next_hop = NULL;
args.eh = &eh2;
- args.inp = NULL; /* used by ipfw uid/gid/jail rules */
+ args.inp = NULL; /* used by ipfw uid/gid/jail rules */
i = ip_fw_chk_ptr(&args);
*mp = args.m;
- if (*mp == NULL)
- return (error);
+ if (*mp == NULL) {
+ return error;
+ }
if (DUMMYNET_LOADED && (i == IP_FW_DUMMYNET)) {
-
/* put the Ethernet header back on */
- M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT);
- if (*mp == NULL)
- return (error);
+ M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT, 0);
+ if (*mp == NULL) {
+ return error;
+ }
bcopy(&eh2, mtod(*mp, caddr_t), ETHER_HDR_LEN);
/*
*/
args.oif = ifp;
ip_dn_io_ptr(mp, DN_TO_IFB_FWD, &args, DN_CLIENT_IPFW);
- return (error);
+ return error;
}
- if (i != IP_FW_PASS) /* drop */
+ if (i != IP_FW_PASS) { /* drop */
goto bad;
+ }
}
ipfwpass:
* Keep the order:
* in_if -> bridge_if -> out_if
*/
- if (pfil_bridge && dir == PFIL_OUT && bifp != NULL)
+ if (pfil_bridge && dir == PFIL_OUT && bifp != NULL) {
error = pfil_run_hooks(&inet_pfil_hook, mp, bifp,
dir, NULL);
+ }
- if (*mp == NULL || error != 0) /* filter may consume */
+ if (*mp == NULL || error != 0) { /* filter may consume */
break;
+ }
- if (pfil_member && ifp != NULL)
+ if (pfil_member && ifp != NULL) {
error = pfil_run_hooks(&inet_pfil_hook, mp, ifp,
dir, NULL);
+ }
- if (*mp == NULL || error != 0) /* filter may consume */
+ if (*mp == NULL || error != 0) { /* filter may consume */
break;
+ }
- if (pfil_bridge && dir == PFIL_IN && bifp != NULL)
+ if (pfil_bridge && dir == PFIL_IN && bifp != NULL) {
error = pfil_run_hooks(&inet_pfil_hook, mp, bifp,
dir, NULL);
+ }
- if (*mp == NULL || error != 0) /* filter may consume */
+ if (*mp == NULL || error != 0) { /* filter may consume */
break;
+ }
/* check if we need to fragment the packet */
if (pfil_member && ifp != NULL && dir == PFIL_OUT) {
if (i > ifp->if_mtu) {
error = bridge_fragment(ifp, *mp, &eh2, snap,
&llc1);
- return (error);
+ return error;
}
}
/* Recalculate the ip checksum and restore byte ordering */
ip = mtod(*mp, struct ip *);
hlen = ip->ip_hl << 2;
- if (hlen < sizeof (struct ip))
+ if (hlen < sizeof(struct ip)) {
goto bad;
+ }
if (hlen > (*mp)->m_len) {
- if ((*mp = m_pullup(*mp, hlen)) == 0)
+ if ((*mp = m_pullup(*mp, hlen)) == 0) {
goto bad;
+ }
ip = mtod(*mp, struct ip *);
- if (ip == NULL)
+ if (ip == NULL) {
goto bad;
+ }
}
ip->ip_len = htons(ip->ip_len);
ip->ip_off = htons(ip->ip_off);
ip->ip_sum = 0;
- if (hlen == sizeof (struct ip))
+ if (hlen == sizeof(struct ip)) {
ip->ip_sum = in_cksum_hdr(ip);
- else
+ } else {
ip->ip_sum = in_cksum(*mp, hlen);
+ }
break;
#if INET6
case ETHERTYPE_IPV6:
- if (pfil_bridge && dir == PFIL_OUT && bifp != NULL)
+ if (pfil_bridge && dir == PFIL_OUT && bifp != NULL) {
error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp,
dir, NULL);
+ }
- if (*mp == NULL || error != 0) /* filter may consume */
+ if (*mp == NULL || error != 0) { /* filter may consume */
break;
+ }
- if (pfil_member && ifp != NULL)
+ if (pfil_member && ifp != NULL) {
error = pfil_run_hooks(&inet6_pfil_hook, mp, ifp,
dir, NULL);
+ }
- if (*mp == NULL || error != 0) /* filter may consume */
+ if (*mp == NULL || error != 0) { /* filter may consume */
break;
+ }
- if (pfil_bridge && dir == PFIL_IN && bifp != NULL)
+ if (pfil_bridge && dir == PFIL_IN && bifp != NULL) {
error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp,
dir, NULL);
+ }
break;
#endif
default:
break;
}
- if (*mp == NULL)
- return (error);
- if (error != 0)
+ if (*mp == NULL) {
+ return error;
+ }
+ if (error != 0) {
goto bad;
+ }
error = -1;
* Finally, put everything back the way it was and return
*/
if (snap) {
- M_PREPEND(*mp, sizeof (struct llc), M_DONTWAIT);
- if (*mp == NULL)
- return (error);
- bcopy(&llc1, mtod(*mp, caddr_t), sizeof (struct llc));
+ M_PREPEND(*mp, sizeof(struct llc), M_DONTWAIT, 0);
+ if (*mp == NULL) {
+ return error;
+ }
+ bcopy(&llc1, mtod(*mp, caddr_t), sizeof(struct llc));
}
- M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT);
- if (*mp == NULL)
- return (error);
+ M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT, 0);
+ if (*mp == NULL) {
+ return error;
+ }
bcopy(&eh2, mtod(*mp, caddr_t), ETHER_HDR_LEN);
- return (0);
+ return 0;
bad:
m_freem(*mp);
*mp = NULL;
- return (error);
+ return error;
}
/*
int len, hlen;
u_short sum;
- if (*mp == NULL)
- return (-1);
+ if (*mp == NULL) {
+ return -1;
+ }
if (IP_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) {
/* max_linkhdr is already rounded up to nearest 4-byte */
- if ((m = m_copyup(m, sizeof (struct ip),
+ if ((m = m_copyup(m, sizeof(struct ip),
max_linkhdr)) == NULL) {
/* XXXJRT new stat, please */
ipstat.ips_toosmall++;
goto bad;
}
- } else if (__predict_false(m->m_len < sizeof (struct ip))) {
- if ((m = m_pullup(m, sizeof (struct ip))) == NULL) {
+ } else if (__predict_false(m->m_len < sizeof(struct ip))) {
+ if ((m = m_pullup(m, sizeof(struct ip))) == NULL) {
ipstat.ips_toosmall++;
goto bad;
}
}
ip = mtod(m, struct ip *);
- if (ip == NULL) goto bad;
+ if (ip == NULL) {
+ goto bad;
+ }
if (ip->ip_v != IPVERSION) {
ipstat.ips_badvers++;
goto bad;
}
hlen = ip->ip_hl << 2;
- if (hlen < sizeof (struct ip)) { /* minimum header length */
+ if (hlen < sizeof(struct ip)) { /* minimum header length */
ipstat.ips_badhlen++;
goto bad;
}
goto bad;
}
ip = mtod(m, struct ip *);
- if (ip == NULL) goto bad;
+ if (ip == NULL) {
+ goto bad;
+ }
}
if (m->m_pkthdr.csum_flags & CSUM_IP_CHECKED) {
sum = !(m->m_pkthdr.csum_flags & CSUM_IP_VALID);
} else {
- if (hlen == sizeof (struct ip)) {
+ if (hlen == sizeof(struct ip)) {
sum = in_cksum_hdr(ip);
} else {
sum = in_cksum(m, hlen);
/* Checks out, proceed */
*mp = m;
- return (0);
+ return 0;
bad:
*mp = m;
- return (-1);
+ return -1;
}
#if INET6
if (IP6_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) {
struct ifnet *inifp = m->m_pkthdr.rcvif;
/* max_linkhdr is already rounded up to nearest 4-byte */
- if ((m = m_copyup(m, sizeof (struct ip6_hdr),
+ if ((m = m_copyup(m, sizeof(struct ip6_hdr),
max_linkhdr)) == NULL) {
/* XXXJRT new stat, please */
ip6stat.ip6s_toosmall++;
in6_ifstat_inc(inifp, ifs6_in_hdrerr);
goto bad;
}
- } else if (__predict_false(m->m_len < sizeof (struct ip6_hdr))) {
+ } else if (__predict_false(m->m_len < sizeof(struct ip6_hdr))) {
struct ifnet *inifp = m->m_pkthdr.rcvif;
- if ((m = m_pullup(m, sizeof (struct ip6_hdr))) == NULL) {
+ if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == NULL) {
ip6stat.ip6s_toosmall++;
in6_ifstat_inc(inifp, ifs6_in_hdrerr);
goto bad;
/* Checks out, proceed */
*mp = m;
- return (0);
+ return 0;
bad:
*mp = m;
- return (-1);
+ return -1;
}
#endif /* INET6 */
*/
static int
bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh,
- int snap, struct llc *llc)
+ int snap, struct llc *llc)
{
struct mbuf *m0;
struct ip *ip;
int error = -1;
- if (m->m_len < sizeof (struct ip) &&
- (m = m_pullup(m, sizeof (struct ip))) == NULL)
+ if (m->m_len < sizeof(struct ip) &&
+ (m = m_pullup(m, sizeof(struct ip))) == NULL) {
goto out;
+ }
ip = mtod(m, struct ip *);
error = ip_fragment(ip, &m, ifp->if_mtu, ifp->if_hwassist,
CSUM_DELAY_IP);
- if (error)
+ if (error) {
goto out;
+ }
/* walk the chain and re-add the Ethernet header */
for (m0 = m; m0; m0 = m0->m_nextpkt) {
if (error == 0) {
if (snap) {
- M_PREPEND(m0, sizeof (struct llc), M_DONTWAIT);
+ M_PREPEND(m0, sizeof(struct llc), M_DONTWAIT, 0);
if (m0 == NULL) {
error = ENOBUFS;
continue;
}
bcopy(llc, mtod(m0, caddr_t),
- sizeof (struct llc));
+ sizeof(struct llc));
}
- M_PREPEND(m0, ETHER_HDR_LEN, M_DONTWAIT);
+ M_PREPEND(m0, ETHER_HDR_LEN, M_DONTWAIT, 0);
if (m0 == NULL) {
error = ENOBUFS;
continue;
}
}
- if (error == 0)
+ if (error == 0) {
ipstat.ips_fragmented++;
+ }
- return (error);
+ return error;
out:
- if (m != NULL)
+ if (m != NULL) {
m_freem(m);
- return (error);
+ }
+ return error;
}
#endif /* PFIL_HOOKS */
/* TBD locking */
if (sc == NULL || (sc->sc_flags & SCF_DETACHING)) {
- return (ENODEV);
+ return ENODEV;
}
-
switch (mode) {
- case BPF_TAP_DISABLE:
- sc->sc_bpf_input = sc->sc_bpf_output = NULL;
- break;
+ case BPF_TAP_DISABLE:
+ sc->sc_bpf_input = sc->sc_bpf_output = NULL;
+ break;
- case BPF_TAP_INPUT:
- sc->sc_bpf_input = bpf_callback;
- break;
+ case BPF_TAP_INPUT:
+ sc->sc_bpf_input = bpf_callback;
+ break;
- case BPF_TAP_OUTPUT:
- sc->sc_bpf_output = bpf_callback;
- break;
+ case BPF_TAP_OUTPUT:
+ sc->sc_bpf_output = bpf_callback;
+ break;
- case BPF_TAP_INPUT_OUTPUT:
- sc->sc_bpf_input = sc->sc_bpf_output = bpf_callback;
- break;
+ case BPF_TAP_INPUT_OUTPUT:
+ sc->sc_bpf_input = sc->sc_bpf_output = bpf_callback;
+ break;
- default:
- break;
+ default:
+ break;
}
- return (0);
+ return 0;
}
/*
ifnet_release(ifp);
lck_mtx_destroy(&sc->sc_mtx, bridge_lock_grp);
-
- _FREE(sc, M_DEVBUF);
+ if_clone_softc_deallocate(&bridge_cloner, sc);
}
/*
}
(*sc->sc_bpf_input)(ifp, m);
}
- return (0);
+ return 0;
}
/*
if (sc->sc_bpf_output) {
(*sc->sc_bpf_output)(ifp, m);
}
- return (0);
+ return 0;
}
/*
bridge_link_event(struct ifnet *ifp, u_int32_t event_code)
{
struct {
- struct kern_event_msg header;
- u_int32_t unit;
- char if_name[IFNAMSIZ];
+ struct kern_event_msg header;
+ u_int32_t unit;
+ char if_name[IFNAMSIZ];
} event;
#if BRIDGE_DEBUG
- if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
printf("%s: %s event_code %u - %s\n", __func__, ifp->if_xname,
event_code, dlil_kev_dl_code_str(event_code));
+ }
#endif /* BRIDGE_DEBUG */
- bzero(&event, sizeof (event));
- event.header.total_size = sizeof (event);
- event.header.vendor_code = KEV_VENDOR_APPLE;
- event.header.kev_class = KEV_NETWORK_CLASS;
- event.header.kev_subclass = KEV_DL_SUBCLASS;
- event.header.event_code = event_code;
- event.header.event_data[0] = ifnet_family(ifp);
- event.unit = (u_int32_t)ifnet_unit(ifp);
+ bzero(&event, sizeof(event));
+ event.header.total_size = sizeof(event);
+ event.header.vendor_code = KEV_VENDOR_APPLE;
+ event.header.kev_class = KEV_NETWORK_CLASS;
+ event.header.kev_subclass = KEV_DL_SUBCLASS;
+ event.header.event_code = event_code;
+ event.header.event_data[0] = ifnet_family(ifp);
+ event.unit = (u_int32_t)ifnet_unit(ifp);
strlcpy(event.if_name, ifnet_name(ifp), IFNAMSIZ);
ifnet_event(ifp, &event.header);
}
-#define BRIDGE_HF_DROP(reason, func, line) { \
+#define BRIDGE_HF_DROP(reason, func, line) { \
bridge_hostfilter_stats.reason++; \
if (if_bridge_debug & BR_DBGF_HOSTFILTER) \
- printf("%s.%d" #reason, func, line); \
+ printf("%s.%d" #reason, func, line); \
error = EINVAL; \
}
}
error = 0;
done:
- return (error);
+ return error;
}
static int
if (eh->ether_type == htons(ETHERTYPE_ARP)) {
struct ether_arp *ea;
size_t minlen = sizeof(struct ether_header) +
- sizeof(struct ether_arp);
+ sizeof(struct ether_arp);
/*
* Make the Ethernet and ARP headers contiguous
}
if (mbuf_len(m) < minlen && mbuf_pullup(&m, minlen) != 0) {
BRIDGE_HF_DROP(brhf_arp_pullup_failed,
- __func__, __LINE__);
+ __func__, __LINE__);
goto done;
}
/*
ea = (struct ether_arp *)(eh + 1);
if (ea->arp_hrd != htons(ARPHRD_ETHER)) {
BRIDGE_HF_DROP(brhf_arp_bad_hw_type,
- __func__, __LINE__);
+ __func__, __LINE__);
goto done;
}
if (ea->arp_pro != htons(ETHERTYPE_IP)) {
BRIDGE_HF_DROP(brhf_arp_bad_pro_type,
- __func__, __LINE__);
+ __func__, __LINE__);
goto done;
}
/*
}
if (ea->arp_pln != sizeof(struct in_addr)) {
BRIDGE_HF_DROP(brhf_arp_bad_pro_len,
- __func__, __LINE__);
+ __func__, __LINE__);
goto done;
}
* May be null for an ARP probe
*/
if (bcmp(ea->arp_spa, &bif->bif_hf_ipsrc.s_addr,
- sizeof(struct in_addr)) != 0 &&
+ sizeof(struct in_addr)) != 0 &&
bcmp(ea->arp_spa, &inaddr_any,
- sizeof(struct in_addr)) != 0) {
+ sizeof(struct in_addr)) != 0) {
BRIDGE_HF_DROP(brhf_arp_bad_spa, __func__, __LINE__);
goto done;
}
minlen += sizeof(struct udphdr);
if (mbuf_pkthdr_len(m) < minlen) {
BRIDGE_HF_DROP(brhf_ip_too_small,
- __func__, __LINE__);
+ __func__, __LINE__);
goto done;
}
if (iphdr.ip_src.s_addr != bif->bif_hf_ipsrc.s_addr &&
iphdr.ip_src.s_addr != INADDR_ANY) {
BRIDGE_HF_DROP(brhf_ip_bad_srcaddr,
- __func__, __LINE__);
+ __func__, __LINE__);
goto done;
}
offset = sizeof(struct ether_header) +
sizeof(struct udphdr), &udp);
if (error != 0) {
BRIDGE_HF_DROP(brhf_ip_too_small,
- __func__, __LINE__);
+ __func__, __LINE__);
goto done;
}
/*
minlen += sizeof(struct dhcp);
if (mbuf_pkthdr_len(m) < minlen) {
BRIDGE_HF_DROP(brhf_ip_too_small,
- __func__, __LINE__);
+ __func__, __LINE__);
goto done;
}
offset += sizeof(struct udphdr);
error = bridge_dhcp_filter(bif, m, offset);
- if (error != 0)
+ if (error != 0) {
goto done;
+ }
} else if (iphdr.ip_src.s_addr == INADDR_ANY) {
BRIDGE_HF_DROP(brhf_ip_bad_srcaddr,
- __func__, __LINE__);
+ __func__, __LINE__);
goto done;
}
} else if (iphdr.ip_src.s_addr != bif->bif_hf_ipsrc.s_addr ||
bif->bif_hf_ipsrc.s_addr == INADDR_ANY) {
-
BRIDGE_HF_DROP(brhf_ip_bad_srcaddr, __func__, __LINE__);
goto done;
}
printf("\n");
}
- if (m != NULL)
+ if (m != NULL) {
m_freem(m);
+ }
}
- return (error);
+ return error;
}
projects / apple / xnu.git / blobdiff