-/* $NetBSD: if_bridge.c,v 1.31 2005/06/01 19:45:34 jdc Exp $ */
/*
- * Copyright (c) 2004-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2015 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
+/* $NetBSD: if_bridge.c,v 1.31 2005/06/01 19:45:34 jdc Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
* 802.11, VLANs on Ethernet, etc.) Figure out a nice way
* to bridge other types of interfaces (FDDI-FDDI, and maybe
* consider heterogenous bridges).
+ *
+ * - GIF isn't handled due to the lack of IPPROTO_ETHERIP support.
*/
#include <sys/cdefs.h>
-//__FBSDID("$FreeBSD$");
-
-//#include "opt_inet.h"
-//#include "opt_inet6.h"
-//#include "opt_carp.h"
-#define BRIDGE_DEBUG 1
-#ifndef BRIDGE_DEBUG
-#define BRIDGE_DEBUG 0
-#endif /* BRIDGE_DEBUG */
+#define BRIDGE_DEBUG 1
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/time.h>
#include <sys/socket.h> /* for net/if.h */
#include <sys/sockio.h>
-//#include <sys/ctype.h> /* string functions */
#include <sys/kernel.h>
#include <sys/random.h>
#include <sys/syslog.h>
#include <sys/sysctl.h>
-//#include <vm/uma.h>
-//#include <sys/module.h>
-//#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/lock.h>
-//#include <sys/mutex.h>
#include <sys/mcache.h>
#include <sys/kauth.h>
+#include <kern/thread_call.h>
+
#include <libkern/libkern.h>
#include <kern/zalloc.h>
#include <net/bpf.h>
#endif
#include <net/if.h>
-//#include <net/if_clone.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/if_var.h>
-//#include <net/pfil.h>
+#include <net/if_media.h>
#include <netinet/in.h> /* for struct arpcom */
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
+#define _IP_VHL
#include <netinet/ip.h>
#include <netinet/ip_var.h>
-#ifdef INET6
+#if INET6
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#endif
#ifdef DEV_CARP
#include <netinet/ip_carp.h>
#endif
-//#include <machine/in_cksum.h>
#include <netinet/if_ether.h> /* for struct arpcom */
#include <net/bridgestp.h>
#include <net/if_bridgevar.h>
#include <net/if_llc.h>
+#if NVLAN > 0
#include <net/if_vlan_var.h>
+#endif /* NVLAN > 0 */
#include <net/if_ether.h>
#include <net/dlil.h>
#include <netinet/ip_fw2.h>
#include <netinet/ip_dummynet.h>
#endif /* PFIL_HOOKS */
+#include <dev/random/randomdev.h>
+
+#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
+#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)
#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_LOCK_ASSERT(_sc) lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED)
+#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) lck_mtx_lock((_sc)->sc_mtx)
-#define BRIDGE_UNLOCK(_sc) lck_mtx_unlock((_sc)->sc_mtx)
-#define BRIDGE_LOCK_ASSERT(_sc) lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED)
-#define BRIDGE_LOCK2REF(_sc, _err) do { \
- lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED); \
- if ((_sc)->sc_iflist_xcnt > 0) \
- (_err) = EBUSY; \
- else \
- (_sc)->sc_iflist_ref++; \
- lck_mtx_unlock((_sc)->sc_mtx); \
+#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); \
} while (0)
#define BRIDGE_UNREF(_sc) do { \
- lck_mtx_lock((_sc)->sc_mtx); \
+ _BRIDGE_LOCK(_sc); \
(_sc)->sc_iflist_ref--; \
if (((_sc)->sc_iflist_xcnt > 0) && ((_sc)->sc_iflist_ref == 0)) { \
- lck_mtx_unlock((_sc)->sc_mtx); \
- wakeup(&(_sc)->sc_cv); \
- } else \
- lck_mtx_unlock((_sc)->sc_mtx); \
+ _BRIDGE_UNLOCK(_sc); \
+ wakeup(&(_sc)->sc_cv); \
+ } else \
+ _BRIDGE_UNLOCK(_sc); \
} while (0)
-#define BRIDGE_XLOCK(_sc) do { \
- lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED); \
- (_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 { \
- lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED); \
- (_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) \
+#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 */
/*
- * Size of the route hash table. Must be a power of two.
+ * Initial size of the route hash table. Must be a power of two.
*/
-/* APPLE MODIFICATION - per Wasabi performance improvement, change the hash table size */
-#if 0
-#ifndef BRIDGE_RTHASH_SIZE
-#define BRIDGE_RTHASH_SIZE 1024
-#endif
-#else
#ifndef BRIDGE_RTHASH_SIZE
-#define BRIDGE_RTHASH_SIZE 256
-#endif
+#define BRIDGE_RTHASH_SIZE 16
#endif
-/* APPLE MODIFICATION - support for HW checksums */
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
-#include <netinet/udp.h>
-#include <netinet/tcp.h>
-#endif
+/*
+ * Maximum size of the routing hash table
+ */
+#define BRIDGE_RTHASH_SIZE_MAX 2048
-#define BRIDGE_RTHASH_MASK (BRIDGE_RTHASH_SIZE - 1)
+#define BRIDGE_RTHASH_MASK(sc) ((sc)->sc_rthash_size - 1)
/*
* Maximum number of addresses to cache.
TAILQ_ENTRY(bridge_iflist) bif_next;
struct ifnet *bif_ifp; /* member if */
struct bstp_port bif_stp; /* STP state */
- uint32_t bif_flags; /* 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;
- char bif_promisc; /* promiscuous mode set */
- char bif_proto_attached; /* protocol attached */
- char bif_filter_attached; /* interface filter attached */
+ 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 */
+
/*
* Bridge route node.
*/
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 */
+ 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
+/*
+ * 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;
+};
+
+#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 */
- LIST_ENTRY(bridge_softc) sc_list;
- lck_mtx_t *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 */
- LIST_HEAD(, bridge_rtnode) *sc_rthash; /* our forwarding table */
- LIST_HEAD(, bridge_rtnode) sc_rtlist; /* list version of above */
- uint32_t sc_rthash_key; /* key for hash */
- 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 */
-
- char sc_if_xname[IFNAMSIZ];
- bpf_packet_func sc_bpf_input;
- bpf_packet_func sc_bpf_output;
- u_int32_t sc_flags;
+ struct ifnet *sc_ifp; /* make this an interface */
+ 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;
+ struct bridge_delayed_call sc_aging_timer;
+ struct bridge_delayed_call sc_resize_call;
#if BRIDGE_DEBUG
- void *lock_lr[BR_LCKDBG_MAX]; /* locking calling history */
- int next_lock_lr;
- void *unlock_lr[BR_LCKDBG_MAX]; /* unlocking caller history */
- int next_unlock_lr;
+ /*
+ * 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;
#endif /* BRIDGE_DEBUG */
};
-#define SCF_DETACHING 0x1
+#define SCF_DETACHING 0x01
+#define SCF_RESIZING 0x02
+#define SCF_MEDIA_ACTIVE 0x04
-static lck_mtx_t *bridge_list_mtx;
-//eventhandler_tag bridge_detach_cookie = NULL;
+struct bridge_hostfilter_stats bridge_hostfilter_stats;
-int bridge_rtable_prune_period = BRIDGE_RTABLE_PRUNE_PERIOD;
+decl_lck_mtx_data(static, bridge_list_mtx);
-static zone_t bridge_rtnode_pool = NULL;
+static int bridge_rtable_prune_period = BRIDGE_RTABLE_PRUNE_PERIOD;
+
+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 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 *);
#if HAS_BRIDGE_DUMMYNET
static void bridge_dummynet(struct mbuf *, struct ifnet *);
#endif
-static void bridge_stop(struct ifnet *, int);
-static errno_t bridge_start(struct ifnet *, struct mbuf *);
+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_output(struct ifnet *, struct mbuf *, struct sockaddr *,
- struct rtentry *);
+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 void bridge_enqueue(struct bridge_softc *, struct ifnet *,
+static int bridge_enqueue(struct bridge_softc *, struct ifnet *,
struct mbuf *);
static void bridge_rtdelete(struct bridge_softc *, struct ifnet *ifp, int);
static void bridge_forward(struct bridge_softc *, struct bridge_iflist *,
- struct mbuf *m);
+ struct mbuf *);
-static void bridge_timer(void *);
+static void bridge_aging_timer(struct bridge_softc *sc);
static void bridge_broadcast(struct bridge_softc *, struct ifnet *,
struct mbuf *, int);
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 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 *);
+#if BRIDGESTP
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);
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 *arg);
+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 **mp);
+static int bridge_ip_checkbasic(struct mbuf **);
#ifdef INET6
-static int bridge_ip6_checkbasic(struct mbuf **mp);
+static int bridge_ip6_checkbasic(struct mbuf **);
#endif /* INET6 */
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 ifn, bpf_tap_mode mode, bpf_packet_func bpf_callback);
-__private_extern__ errno_t bridge_bpf_input(ifnet_t ifp, struct mbuf *m);
-__private_extern__ errno_t bridge_bpf_output(ifnet_t ifp, struct mbuf *m);
+static errno_t bridge_set_bpf_tap(ifnet_t, bpf_tap_mode, bpf_packet_func);
+__private_extern__ errno_t bridge_bpf_input(ifnet_t, struct mbuf *);
+__private_extern__ errno_t bridge_bpf_output(ifnet_t, struct mbuf *);
-static void bridge_detach(ifnet_t ifp);
+static void bridge_detach(ifnet_t);
+static void bridge_link_event(struct ifnet *, u_int32_t);
+static void bridge_iflinkevent(struct ifnet *);
+static u_int32_t bridge_updatelinkstatus(struct bridge_softc *);
+static int interface_media_active(struct ifnet *);
+static void bridge_schedule_delayed_call(struct bridge_delayed_call *);
+static void bridge_cancel_delayed_call(struct bridge_delayed_call *);
+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
+u_int8_t bstp_etheraddr[ETHER_ADDR_LEN] =
+ { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
+
+static u_int8_t ethernulladdr[ETHER_ADDR_LEN] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+#if BRIDGESTP
static struct bstp_cb_ops bridge_ops = {
.bcb_state = bridge_state_change,
.bcb_rtage = bridge_rtable_expire
};
+#endif /* BRIDGESTP */
SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, IFT_BRIDGE, bridge, CTLFLAG_RW, 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");
+
+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");
+
+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");
+
+#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");
+#endif
+
+SYSCTL_STRUCT(_net_link_bridge, OID_AUTO,
+ 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_member = 1; /* run pfil hooks on the member interface */
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,
- &pfil_onlyip, 0, "Only pass IP packets when pfil is enabled");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, ipfw_arp, CTLFLAG_RW,
- &pfil_ipfw_arp, 0, "Filter ARP packets through IPFW layer2");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_bridge, CTLFLAG_RW,
- &pfil_bridge, 0, "Packet filter on the bridge interface");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_member, CTLFLAG_RW,
- &pfil_member, 0, "Packet filter on the member interface");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_local_phys, CTLFLAG_RW,
- &pfil_local_phys, 0,
- "Packet filter on the physical interface for locally destined packets");
+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");
+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");
#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 *);
+ int (*bc_func)(struct bridge_softc *, void *);
unsigned int bc_argsize;
unsigned int bc_flags;
};
#define BC_F_SUSER 0x04 /* do super-user check */
static const struct bridge_control bridge_control_table32[] = {
- { bridge_ioctl_add, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_del, sizeof(struct ifbreq),
- 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 },
-
- { bridge_ioctl_scache, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_gcache, sizeof(struct ifbrparam),
- 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 },
-
- { bridge_ioctl_saddr32, sizeof(struct ifbareq32),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_sto, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_gto, sizeof(struct ifbrparam),
- BC_F_COPYOUT },
-
- { bridge_ioctl_daddr32, sizeof(struct ifbareq32),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_flush, sizeof(struct ifbreq),
- 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 },
-
- { bridge_ioctl_ght, sizeof(struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sht, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_gfd, sizeof(struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sfd, sizeof(struct ifbrparam),
+ { 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 },
+
+ { bridge_ioctl_gifflags, sizeof (struct ifbreq),
+ BC_F_COPYIN|BC_F_COPYOUT },
+ { bridge_ioctl_sifflags, sizeof (struct ifbreq),
+ 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 },
+
+ { bridge_ioctl_gifs32, sizeof (struct ifbifconf32),
+ BC_F_COPYIN|BC_F_COPYOUT },
+ { bridge_ioctl_rts32, sizeof (struct ifbaconf32),
+ BC_F_COPYIN|BC_F_COPYOUT },
+
+ { bridge_ioctl_saddr32, sizeof (struct ifbareq32),
+ 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 },
+
+ { bridge_ioctl_daddr32, sizeof (struct ifbareq32),
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_flush, sizeof (struct ifbreq),
+ 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 },
+
+ { bridge_ioctl_ght, sizeof (struct ifbrparam),
+ BC_F_COPYOUT },
+ { bridge_ioctl_sht, sizeof (struct ifbrparam),
+ 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 },
+
+ { bridge_ioctl_gma, sizeof (struct ifbrparam),
+ BC_F_COPYOUT },
+ { bridge_ioctl_sma, sizeof (struct ifbrparam), /* 20 */
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_sifprio, sizeof (struct ifbreq),
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_sifcost, sizeof (struct ifbreq),
+ 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 },
+
+ { bridge_ioctl_purge, sizeof (struct ifbreq),
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_addspan, sizeof (struct ifbreq),
BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_gma, sizeof(struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sma, sizeof(struct ifbrparam),
+ { bridge_ioctl_delspan, sizeof (struct ifbreq),
BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_sifprio, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_sifcost, sizeof(struct ifbreq),
- 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 },
- { bridge_ioctl_purge, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { bridge_ioctl_gbparam32, sizeof (struct ifbropreq32),
+ BC_F_COPYOUT },
- { bridge_ioctl_addspan, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_delspan, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_gbparam32, sizeof(struct ifbropreq32),
- BC_F_COPYOUT },
-
- { bridge_ioctl_grte, sizeof(struct ifbrparam),
- BC_F_COPYOUT },
-
- { bridge_ioctl_gifsstp32, sizeof(struct ifbpstpconf32),
- BC_F_COPYIN|BC_F_COPYOUT },
-
- { bridge_ioctl_sproto, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_stxhc, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_sifmaxaddr, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
+ { bridge_ioctl_grte, sizeof (struct ifbrparam),
+ BC_F_COPYOUT },
+
+ { bridge_ioctl_gifsstp32, sizeof (struct ifbpstpconf32), /* 30 */
+ BC_F_COPYIN|BC_F_COPYOUT },
+
+ { bridge_ioctl_sproto, sizeof (struct ifbrparam),
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_stxhc, sizeof (struct ifbrparam),
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_sifmaxaddr, sizeof (struct ifbreq),
+ 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 },
};
static const struct bridge_control bridge_control_table64[] = {
- { bridge_ioctl_add, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_del, sizeof(struct ifbreq),
- 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 },
-
- { bridge_ioctl_scache, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_gcache, sizeof(struct ifbrparam),
- 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 },
-
- { bridge_ioctl_saddr64, sizeof(struct ifbareq64),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_sto, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_gto, sizeof(struct ifbrparam),
- BC_F_COPYOUT },
-
- { bridge_ioctl_daddr64, sizeof(struct ifbareq64),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_flush, sizeof(struct ifbreq),
- 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 },
-
- { bridge_ioctl_ght, sizeof(struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sht, sizeof(struct ifbrparam),
- 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 },
-
- { bridge_ioctl_gma, sizeof(struct ifbrparam),
- BC_F_COPYOUT },
- { bridge_ioctl_sma, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_sifprio, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_sifcost, sizeof(struct ifbreq),
- 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 },
+ { 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 },
- { bridge_ioctl_purge, sizeof(struct ifbreq),
- 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 },
- { bridge_ioctl_addspan, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
- { bridge_ioctl_delspan, sizeof(struct ifbreq),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_gbparam64, sizeof(struct ifbropreq64),
- BC_F_COPYOUT },
-
- { bridge_ioctl_grte, sizeof(struct ifbrparam),
- BC_F_COPYOUT },
-
- { bridge_ioctl_gifsstp64, sizeof(struct ifbpstpconf64),
- BC_F_COPYIN|BC_F_COPYOUT },
-
- { bridge_ioctl_sproto, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_stxhc, sizeof(struct ifbrparam),
- BC_F_COPYIN|BC_F_SUSER },
-
- { bridge_ioctl_sifmaxaddr, sizeof(struct ifbreq),
- 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 },
+
+ { bridge_ioctl_gifs64, sizeof (struct ifbifconf64),
+ BC_F_COPYIN|BC_F_COPYOUT },
+ { bridge_ioctl_rts64, sizeof (struct ifbaconf64),
+ BC_F_COPYIN|BC_F_COPYOUT },
+
+ { bridge_ioctl_saddr64, sizeof (struct ifbareq64),
+ 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 },
+
+ { bridge_ioctl_daddr64, sizeof (struct ifbareq64),
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_flush, sizeof (struct ifbreq),
+ 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 },
+
+ { bridge_ioctl_ght, sizeof (struct ifbrparam),
+ BC_F_COPYOUT },
+ { bridge_ioctl_sht, sizeof (struct ifbrparam),
+ 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 },
+
+ { bridge_ioctl_gma, sizeof (struct ifbrparam),
+ BC_F_COPYOUT },
+ { bridge_ioctl_sma, sizeof (struct ifbrparam), /* 20 */
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_sifprio, sizeof (struct ifbreq),
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_sifcost, sizeof (struct ifbreq),
+ 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 },
+
+ { bridge_ioctl_purge, sizeof (struct ifbreq),
+ 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 },
+
+ { bridge_ioctl_gbparam64, sizeof (struct ifbropreq64),
+ BC_F_COPYOUT },
+
+ { bridge_ioctl_grte, sizeof (struct ifbrparam),
+ BC_F_COPYOUT },
+
+ { bridge_ioctl_gifsstp64, sizeof (struct ifbpstpconf64), /* 30 */
+ BC_F_COPYIN|BC_F_COPYOUT },
+
+ { bridge_ioctl_sproto, sizeof (struct ifbrparam),
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_stxhc, sizeof (struct ifbrparam),
+ BC_F_COPYIN|BC_F_SUSER },
+
+ { bridge_ioctl_sifmaxaddr, sizeof (struct ifbreq),
+ 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 },
};
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);
+static LIST_HEAD(, bridge_softc) 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;
-__private_extern__ int _if_brige_debug = 0;
-
-SYSCTL_INT(_net_link_bridge, OID_AUTO, debug, CTLFLAG_RW,
- &_if_brige_debug, 0, "Bridge debug");
+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_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");
-static void printf_ether_header(struct ether_header *eh);
-static void printf_mbuf_data(mbuf_t m, size_t offset, size_t len);
-static void printf_mbuf_pkthdr(mbuf_t m, const char *prefix, const char *suffix);
-static void printf_mbuf(mbuf_t m, const char *prefix, const char *suffix);
-static void link_print(struct sockaddr_dl * dl_p);
+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 bridge_lock(struct bridge_softc *);
static void bridge_unlock(struct bridge_softc *);
static void bridge_xlock(struct bridge_softc *);
static void bridge_xdrop(struct bridge_softc *);
-static void bridge_lock(struct bridge_softc *sc)
+static void
+bridge_lock(struct bridge_softc *sc)
{
void *lr_saved = __builtin_return_address(0);
-
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
- lck_mtx_lock(sc->sc_mtx);
-
+ BRIDGE_LOCK_ASSERT_NOTHELD(sc);
+
+ _BRIDGE_LOCK(sc);
+
sc->lock_lr[sc->next_lock_lr] = lr_saved;
sc->next_lock_lr = (sc->next_lock_lr+1) % SO_LCKDBG_MAX;
}
-static void bridge_unlock(struct bridge_softc *sc)
+static void
+bridge_unlock(struct bridge_softc *sc)
{
void *lr_saved = __builtin_return_address(0);
-
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+
+ 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;
-
- lck_mtx_unlock(sc->sc_mtx);
+
+ _BRIDGE_UNLOCK(sc);
}
-static int bridge_lock2ref(struct bridge_softc *sc)
+static int
+bridge_lock2ref(struct bridge_softc *sc)
{
int error = 0;
void *lr_saved = __builtin_return_address(0);
-
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
if (sc->sc_iflist_xcnt > 0)
error = EBUSY;
sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
- lck_mtx_unlock(sc->sc_mtx);
-
- return error;
+
+ _BRIDGE_UNLOCK(sc);
+
+ return (error);
}
-static void bridge_unref(struct bridge_softc *sc)
+static void
+bridge_unref(struct bridge_softc *sc)
{
void *lr_saved = __builtin_return_address(0);
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+ BRIDGE_LOCK_ASSERT_NOTHELD(sc);
- lck_mtx_lock(sc->sc_mtx);
+ _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->sc_iflist_ref--;
-
+
sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
- if ((sc->sc_iflist_xcnt > 0) && (sc->sc_iflist_ref == 0)) {
- lck_mtx_unlock(sc->sc_mtx);
+ if ((sc->sc_iflist_xcnt > 0) && (sc->sc_iflist_ref == 0)) {
+ _BRIDGE_UNLOCK(sc);
wakeup(&sc->sc_cv);
} else
- lck_mtx_unlock(sc->sc_mtx);
+ _BRIDGE_UNLOCK(sc);
}
-static void bridge_xlock(struct bridge_softc *sc)
+static void
+bridge_xlock(struct bridge_softc *sc)
{
void *lr_saved = __builtin_return_address(0);
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
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;
-
- msleep(&sc->sc_cv, sc->sc_mtx, PZERO, "BRIDGE_XLOCK", NULL);
+
+ 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;
}
}
-static void bridge_xdrop(struct bridge_softc *sc)
+static void
+bridge_xdrop(struct bridge_softc *sc)
{
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
sc->sc_iflist_xcnt--;
}
printf_mbuf_pkthdr(mbuf_t m, const char *prefix, const char *suffix)
{
if (m)
- printf("%spktlen: %u rcvif: %p header: %p nextpkt: %p%s",
- prefix ? prefix : "",
- (unsigned int)mbuf_pkthdr_len(m), mbuf_pkthdr_rcvif(m), mbuf_pkthdr_header(m), mbuf_nextpkt(m),
- suffix ? suffix : "");
+ 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_rcvif(m)),
+ (uint64_t)VM_KERNEL_ADDRPERM(mbuf_pkthdr_header(m)),
+ (uint64_t)VM_KERNEL_ADDRPERM(mbuf_nextpkt(m)),
+ suffix ? suffix : "");
else
printf("%s<NULL>%s\n", prefix, suffix);
}
printf_mbuf(mbuf_t m, const char *prefix, const char *suffix)
{
if (m) {
- printf("%s%p type: %u flags: 0x%x len: %u data: %p maxlen: %u datastart: %p next: %p%s",
- prefix ? prefix : "",
- m, mbuf_type(m), mbuf_flags(m), (unsigned int)mbuf_len(m), mbuf_data(m),
- (unsigned int)mbuf_maxlen(m), mbuf_datastart(m), mbuf_next(m),
- !suffix || (mbuf_flags(m) & MBUF_PKTHDR) ? "" : suffix);
+ printf("%s0x%llx type: %u flags: 0x%x len: %u data: 0x%llx "
+ "maxlen: %u datastart: 0x%llx next: 0x%llx%s",
+ prefix ? prefix : "", (uint64_t)VM_KERNEL_ADDRPERM(m),
+ mbuf_type(m), mbuf_flags(m), (unsigned int)mbuf_len(m),
+ (uint64_t)VM_KERNEL_ADDRPERM(mbuf_data(m)),
+ (unsigned int)mbuf_maxlen(m),
+ (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))
printf_mbuf_pkthdr(m, " ", suffix);
} else
size_t i, j;
size_t pktlen, mlen, maxlen;
unsigned char *ptr;
-
+
pktlen = mbuf_pkthdr_len(m);
-
+
if (offset > pktlen)
return;
-
- maxlen = (pktlen - offset > len) ? len : pktlen;
+
+ maxlen = (pktlen - offset > len) ? len : pktlen - offset;
n = m;
mlen = mbuf_len(n);
ptr = mbuf_data(n);
printf("%02x%s", ptr[j], i % 2 ? " " : "");
}
}
- return;
}
static void
printf_ether_header(struct ether_header *eh)
{
- printf("%02x:%02x:%02x:%02x:%02x:%02x > %02x:%02x:%02x:%02x:%02x:%02x 0x%04x ",
- eh->ether_shost[0], eh->ether_shost[1], eh->ether_shost[2],
- eh->ether_shost[3], eh->ether_shost[4], eh->ether_shost[5],
- eh->ether_dhost[0], eh->ether_dhost[1], eh->ether_dhost[2],
- eh->ether_dhost[3], eh->ether_dhost[4], eh->ether_dhost[5],
- eh->ether_type);
+ printf("%02x:%02x:%02x:%02x:%02x:%02x > "
+ "%02x:%02x:%02x:%02x:%02x:%02x 0x%04x ",
+ eh->ether_shost[0], eh->ether_shost[1], eh->ether_shost[2],
+ eh->ether_shost[3], eh->ether_shost[4], eh->ether_shost[5],
+ eh->ether_dhost[0], eh->ether_dhost[1], eh->ether_dhost[2],
+ eh->ether_dhost[3], eh->ether_dhost[4], eh->ether_dhost[5],
+ ntohs(eh->ether_type));
}
static void
-link_print(struct sockaddr_dl * dl_p)
+link_print(struct sockaddr_dl *dl_p)
{
int i;
-
+
#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 ", 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);
#endif
for (i = 0; i < dl_p->sdl_alen; i++)
- printf("%s%x", i ? ":" : "",
- (CONST_LLADDR(dl_p))[i]);
+ printf("%s%x", i ? ":" : "", (CONST_LLADDR(dl_p))[i]);
printf("\n");
- return;
}
#endif /* BRIDGE_DEBUG */
* Pseudo-device attach routine.
*/
__private_extern__ int
-bridgeattach(__unused int n)
+bridgeattach(int 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();
-
+
bridge_lock_grp = lck_grp_alloc_init("if_bridge", lck_grp_attr);
-
+
bridge_lock_attr = lck_attr_alloc_init();
-
+
#if BRIDGE_DEBUG
lck_attr_setdebug(bridge_lock_attr);
#endif
- bridge_list_mtx = lck_mtx_alloc_init(bridge_lock_grp, bridge_lock_attr);
-
- // can free the attributes once we've allocated the group lock
+ lck_mtx_init(&bridge_list_mtx, bridge_lock_grp, bridge_lock_attr);
+
+ /* can free the attributes once we've allocated the group lock */
lck_grp_attr_free(lck_grp_attr);
-
+
LIST_INIT(&bridge_list);
-
+
+#if BRIDGESTP
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)
- printf("bridgeattach: ifnet_clone_attach failed %d\n", error);
+ printf("%s: ifnet_clone_attach failed %d\n", __func__, error);
- return error;
+ return (error);
}
#if defined(PFIL_HOOKS)
static int
sysctl_pfil_ipfw SYSCTL_HANDLER_ARGS
{
-#pragma unused(arg1,arg2)
+#pragma unused(arg1, arg2)
int enable = pfil_ipfw;
int 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");
#endif /* PFIL_HOOKS */
* Create a new bridge instance.
*/
static int
-bridge_clone_create(struct if_clone *ifc, uint32_t unit, __unused void *params)
+bridge_clone_create(struct if_clone *ifc, uint32_t unit, void *params)
{
+#pragma unused(params)
struct ifnet *ifp = NULL;
- struct bridge_softc *sc;
- u_char eaddr[6];
- struct ifnet_init_params init_params;
+ struct bridge_softc *sc, *sc2;
+ struct ifnet_init_eparams init_params;
errno_t error = 0;
- uint32_t sdl_buffer[offsetof(struct sockaddr_dl, sdl_data) + IFNAMSIZ + ETHER_ADDR_LEN];
+ 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);
- memset(sc, 0, sizeof(*sc));
+ sc = _MALLOC(sizeof (*sc), M_DEVBUF, M_WAITOK | M_ZERO);
- sc->sc_mtx = lck_mtx_alloc_init(bridge_lock_grp, bridge_lock_attr);
+ lck_mtx_init(&sc->sc_mtx, bridge_lock_grp, bridge_lock_attr);
sc->sc_brtmax = BRIDGE_RTABLE_MAX;
sc->sc_brttimeout = BRIDGE_RTABLE_TIMEOUT;
sc->sc_filter_flags = IFBF_FILT_DEFAULT;
/* Initialize our routing table. */
error = bridge_rtable_init(sc);
if (error != 0) {
- printf("bridge_clone_create: bridge_rtable_init failed %d\n", 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);
- memset(&init_params, 0, sizeof(struct ifnet_init_params));
- init_params.uniqueid = sc->sc_if_xname;
- init_params.uniqueid_len = strlen(sc->sc_if_xname);
- init_params.name = ifc->ifc_name;
- init_params.unit = unit;
- init_params.family = IFNET_FAMILY_ETHERNET;
- init_params.type = IFT_BRIDGE;
- init_params.output = bridge_start;
- 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 = ether_frameout;
- 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;
- error = ifnet_allocate(&init_params, &ifp);
+ 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;
+ } 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;
+ error = ifnet_allocate_extended(&init_params, &ifp);
if (error != 0) {
- printf("bridge_clone_create: ifnet_allocate failed %d\n", 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("bridge_clone_create: ifnet_set_mtu failed %d\n", error);
+ printf("%s: ifnet_set_mtu failed %d\n", __func__, error);
goto done;
}
error = ifnet_set_addrlen(ifp, ETHER_ADDR_LEN);
if (error != 0) {
- printf("bridge_clone_create: ifnet_set_addrlen failed %d\n", error);
- goto done;
- }
- error = ifnet_set_baudrate(ifp, 10000000) ; // XXX: this is what IONetworking does
- if (error != 0) {
- printf("bridge_clone_create: ifnet_set_baudrate failed %d\n", error);
+ printf("%s: ifnet_set_addrlen failed %d\n", __func__, error);
goto done;
}
error = ifnet_set_hdrlen(ifp, ETHER_HDR_LEN);
if (error != 0) {
- printf("bridge_clone_create: ifnet_set_hdrlen failed %d\n", error);
+ 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 = ifnet_set_flags(ifp,
+ IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST,
+ 0xffff);
if (error != 0) {
- printf("bridge_clone_create: ifnet_set_flags failed %d\n", error);
+ printf("%s: ifnet_set_flags failed %d\n", __func__, error);
goto done;
}
-#if 0
/*
- * Generate a random ethernet address with a locally administered
- * address.
+ * 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();
+ * for "hostid", we use the MAC address of the first-encountered
+ * Ethernet-type interface that is currently configured.
*/
- {
- int retry;
-
- for (retry = 1; retry != 0;) {
- struct ifnet *bifp;
- struct bridge_softc *sc2;
-
- read_random(eaddr, ETHER_ADDR_LEN);
- eaddr[0] &= ~1; /* clear multicast bit */
- eaddr[0] |= 2; /* set the LAA bit */
- retry = 0;
- lck_mtx_lock(bridge_list_mtx);
- LIST_FOREACH(sc2, &bridge_list, sc_list) {
- bifp = sc2->sc_ifp;
- if (memcmp(eaddr, ifnet_lladdr(bifp), ETHER_ADDR_LEN) == 0)
- retry = 1;
- }
- lck_mtx_unlock(bridge_list_mtx);
+ fb = 0;
+ has_hostid = (uuid_get_ethernet(ð_hostid[0]) == 0);
+ for (retry = 1; retry != 0; ) {
+ if (fb || has_hostid == 0) {
+ read_random(&sc->sc_defaddr, ETHER_ADDR_LEN);
+ sc->sc_defaddr[0] &= ~1; /* clear multicast bit */
+ sc->sc_defaddr[0] |= 2; /* set the LAA bit */
+ } else {
+ bcopy(ð_hostid[0], &sc->sc_defaddr,
+ 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] & 0x0f) << 4) |
+ ((sc->sc_defaddr[3] & 0xf0) >> 4);
+ /*
+ * Mix in the LSB as it's actually pretty significant,
+ * see rdar://14076061
+ */
+ sc->sc_defaddr[4] =
+ (((sc->sc_defaddr[4] & 0x0f) << 4) |
+ ((sc->sc_defaddr[4] & 0xf0) >> 4)) ^
+ sc->sc_defaddr[5];
+ sc->sc_defaddr[5] = ifp->if_unit & 0xff;
}
+
+ fb = 1;
+ retry = 0;
+ 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)
+ retry = 1;
+ }
+ lck_mtx_unlock(&bridge_list_mtx);
}
-#else
- /*
- * Generate a random ethernet address and use the private AC:DE:48
- * OUI code.
- */
- {
- uint32_t r;
-
- read_random(&r, sizeof(r));
- eaddr[0] = 0xAC;
- eaddr[1] = 0xDE;
- eaddr[2] = 0x48;
- eaddr[3] = (r >> 0) & 0xffu;
- eaddr[4] = (r >> 8) & 0xffu;
- eaddr[5] = (r >> 16) & 0xffu;
- }
-#endif
- memset(sdl, 0, sizeof(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), eaddr, ETHER_ADDR_LEN);
-
+ memcpy(LLADDR(sdl), sc->sc_defaddr, ETHER_ADDR_LEN);
+
+ sc->sc_flags &= ~SCF_MEDIA_ACTIVE;
+
#if BRIDGE_DEBUG
- link_print(sdl);
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ link_print(sdl);
#endif
error = ifnet_attach(ifp, NULL);
if (error != 0) {
- printf("bridge_clone_create: ifnet_attach failed %d\n", error);
+ printf("%s: ifnet_attach failed %d\n", __func__, error);
goto done;
}
-
- error = ifnet_set_lladdr_and_type(ifp, eaddr, ETHER_ADDR_LEN, IFT_ETHER);
+
+ error = ifnet_set_lladdr_and_type(ifp, sc->sc_defaddr, ETHER_ADDR_LEN,
+ IFT_ETHER);
if (error != 0) {
- printf("bridge_clone_create: ifnet_set_lladdr_and_type failed %d\n", error);
+ printf("%s: ifnet_set_lladdr_and_type failed %d\n", __func__,
+ error);
goto done;
}
-
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
- /*
- * APPLE MODIFICATION - our bridge can support HW checksums
- * (useful if underlying interfaces support them) on TX,
- * RX is not that interesting, since the stack just looks to
- * see if the packet has been checksummed already (I think)
- * but we might as well indicate we support it
- */
- ifp->if_capabilities =
- IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_UDPv4_Tx |
- IFCAP_CSUM_IPv4_Rx | IFCAP_CSUM_TCPv4_Rx | IFCAP_CSUM_UDPv4_Rx ;
-#endif
-
+
+ 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);
+ goto done;
+ }
+
+#if BRIDGESTP
bstp_attach(&sc->sc_stp, &bridge_ops);
+#endif /* BRIDGESTP */
- lck_mtx_lock(bridge_list_mtx);
+ lck_mtx_lock(&bridge_list_mtx);
LIST_INSERT_HEAD(&bridge_list, sc, sc_list);
- lck_mtx_unlock(bridge_list_mtx);
+ lck_mtx_unlock(&bridge_list_mtx);
/* attach as ethernet */
- error = bpf_attach(ifp, DLT_EN10MB, sizeof(struct ether_header), NULL, NULL);
+ error = bpf_attach(ifp, DLT_EN10MB, sizeof (struct ether_header),
+ NULL, NULL);
done:
if (error != 0) {
- printf("bridge_clone_create failed error %d\n", error);
+ printf("%s failed error %d\n", __func__, error);
/* Cleanup TBD */
}
-
- 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;
- bridge_stop(ifp, 1);
+ bridge_ifstop(ifp, 1);
+
+ bridge_cancel_delayed_call(&sc->sc_resize_call);
+
+ bridge_cleanup_delayed_call(&sc->sc_resize_call);
+ bridge_cleanup_delayed_call(&sc->sc_aging_timer);
error = ifnet_set_flags(ifp, 0, IFF_UP);
if (error != 0) {
- printf("bridge_clone_destroy: ifnet_set_flags failed %d\n", error);
+ printf("%s: ifnet_set_flags failed %d\n", __func__, error);
}
while ((bif = TAILQ_FIRST(&sc->sc_iflist)) != NULL)
error = ifnet_detach(ifp);
if (error != 0) {
- panic("bridge_clone_destroy: ifnet_detach(%p) failed %d\n", ifp, error);
+ 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);
}
- 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); \
+#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_ioctl:
*
bridge_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct bridge_softc *sc = ifp->if_softc;
- struct ifreq *ifr = (struct ifreq *) data;
+ struct ifreq *ifr = (struct ifreq *)data;
+ struct bridge_iflist *bif;
int error = 0;
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+ BRIDGE_LOCK_ASSERT_NOTHELD(sc);
#if BRIDGE_DEBUG
- if (_if_brige_debug)
- printf("bridge_ioctl: ifp %p cmd 0x%08lx (%c%c [%lu] %c %lu)\n",
- ifp,
- cmd,
- (cmd & IOC_IN) ? 'I' : ' ',
- (cmd & IOC_OUT) ? 'O' : ' ',
- IOCPARM_LEN(cmd),
- (char)IOCGROUP(cmd),
- cmd & 0xff);
-#endif
-
+ 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);
break;
case SIOCGIFMEDIA32:
- case SIOCGIFMEDIA64:
- error = EINVAL;
+ case SIOCGIFMEDIA64: {
+ struct ifmediareq *ifmr = (struct ifmediareq *)data;
+ user_addr_t user_addr;
+
+ user_addr = (cmd == SIOCGIFMEDIA64) ?
+ ((struct ifmediareq64 *)ifmr)->ifmu_ulist :
+ CAST_USER_ADDR_T(((struct ifmediareq32 *)ifmr)->ifmu_ulist);
+
+ ifmr->ifm_status = IFM_AVALID;
+ ifmr->ifm_mask = 0;
+ ifmr->ifm_count = 1;
+
+ BRIDGE_LOCK(sc);
+ if (!(sc->sc_flags & SCF_DETACHING) &&
+ (sc->sc_flags & SCF_MEDIA_ACTIVE)) {
+ ifmr->ifm_status |= IFM_ACTIVE;
+ ifmr->ifm_active = ifmr->ifm_current =
+ IFM_ETHER | IFM_AUTO;
+ } else {
+ ifmr->ifm_active = ifmr->ifm_current = IFM_NONE;
+ }
+ BRIDGE_UNLOCK(sc);
+
+ if (user_addr != USER_ADDR_NULL) {
+ error = copyout(&ifmr->ifm_current, user_addr,
+ sizeof (int));
+ }
break;
+ }
case SIOCADDMULTI:
case SIOCDELMULTI:
struct ifbrparam ifbrparam;
struct ifbropreq32 ifbropreq;
} args;
- struct ifdrv32 *ifd = (struct ifdrv32 *) data;
- const struct bridge_control *bridge_control_table = bridge_control_table32, *bc;
-
+ struct ifdrv32 *ifd = (struct ifdrv32 *)data;
+ const struct bridge_control *bridge_control_table =
+ bridge_control_table32, *bc;
+
DRVSPEC;
break;
struct ifbrparam ifbrparam;
struct ifbropreq64 ifbropreq;
} args;
- struct ifdrv64 *ifd = (struct ifdrv64 *) data;
- const struct bridge_control *bridge_control_table = bridge_control_table64, *bc;
-
+ struct ifdrv64 *ifd = (struct ifdrv64 *)data;
+ const struct bridge_control *bridge_control_table =
+ bridge_control_table64, *bc;
+
DRVSPEC;
-
+
break;
}
* then stop and disable it.
*/
BRIDGE_LOCK(sc);
- bridge_stop(ifp, 1);
+ bridge_ifstop(ifp, 1);
BRIDGE_UNLOCK(sc);
} else if ((ifp->if_flags & IFF_UP) &&
!(ifp->if_flags & IFF_RUNNING)) {
break;
case SIOCSIFLLADDR:
- error = ifnet_set_lladdr(ifp, ifr->ifr_addr.sa_data, ifr->ifr_addr.sa_len);
+ error = ifnet_set_lladdr(ifp, ifr->ifr_addr.sa_data,
+ ifr->ifr_addr.sa_len);
if (error != 0)
- printf("bridge_ioctl: ifnet_set_lladdr failed %d\n", error);
+ printf("%s: SIOCSIFLLADDR error %d\n", ifp->if_xname,
+ error);
break;
case SIOCSIFMTU:
- /* Do not allow the MTU to be changed on the bridge */
- error = EINVAL;
+ if (ifr->ifr_mtu < 576) {
+ error = EINVAL;
+ break;
+ }
+ BRIDGE_LOCK(sc);
+ if (TAILQ_EMPTY(&sc->sc_iflist)) {
+ sc->sc_ifp->if_mtu = ifr->ifr_mtu;
+ BRIDGE_UNLOCK(sc);
+ break;
+ }
+ TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
+ if (bif->bif_ifp->if_mtu != (unsigned)ifr->ifr_mtu) {
+ printf("%s: invalid MTU: %u(%s) != %d\n",
+ sc->sc_ifp->if_xname,
+ bif->bif_ifp->if_mtu,
+ bif->bif_ifp->if_xname, ifr->ifr_mtu);
+ error = EINVAL;
+ break;
+ }
+ }
+ if (!error)
+ sc->sc_ifp->if_mtu = ifr->ifr_mtu;
+ BRIDGE_UNLOCK(sc);
break;
default:
- /*
- * drop the lock as ether_ioctl() will call bridge_start() and
- * cause the lock to be recursed.
- */
error = ether_ioctl(ifp, cmd, data);
#if BRIDGE_DEBUG
- if (error != 0)
- printf("bridge_ioctl: ether_ioctl ifp %p cmd 0x%08lx (%c%c [%lu] %c %lu) failed error: %d\n",
- ifp,
- cmd,
- (cmd & IOC_IN) ? 'I' : ' ',
- (cmd & IOC_OUT) ? 'O' : ' ',
- IOCPARM_LEN(cmd),
- (char) IOCGROUP(cmd),
- cmd & 0xff,
- error);
+ 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_IN) ? 'I' : ' ',
+ (cmd & IOC_OUT) ? 'O' : ' ',
+ IOCPARM_LEN(cmd), (char)IOCGROUP(cmd),
+ cmd & 0xff, error);
#endif /* BRIDGE_DEBUG */
break;
}
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+ BRIDGE_LOCK_ASSERT_NOTHELD(sc);
return (error);
}
struct ifreq ifr;
int error;
- bzero(&ifr, sizeof(ifr));
+ bzero(&ifr, sizeof (ifr));
ifr.ifr_reqcap = set;
if (ifp->if_capenable != set) {
error = (*ifp->if_ioctl)(ifp, SIOCSIFCAP, (caddr_t)&ifr);
IFF_UNLOCKGIANT(ifp);
if (error)
- printf("error setting interface capabilities on %s\n",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
+ printf("%s: %s error setting interface capabilities "
+ "on %s\n", __func__, sc->sc_ifp->if_xname,
ifp->if_xname);
}
}
#endif /* HAS_IF_CAP */
-/*
- * bridge_lookup_member:
- *
- * Lookup a bridge member interface.
- */
-static struct bridge_iflist *
-bridge_lookup_member(struct bridge_softc *sc, const char *name)
+static errno_t
+bridge_set_tso(struct bridge_softc *sc)
{
struct bridge_iflist *bif;
- struct ifnet *ifp;
- char if_xname[IFNAMSIZ];
+ u_int32_t tso_v4_mtu;
+ u_int32_t tso_v6_mtu;
+ ifnet_offload_t offload;
+ errno_t error = 0;
- BRIDGE_LOCK_ASSERT(sc);
+ /* By default, support TSO */
+ offload = sc->sc_ifp->if_hwassist | IFNET_TSO_IPV4 | IFNET_TSO_IPV6;
+ tso_v4_mtu = IP_MAXPACKET;
+ tso_v6_mtu = IP_MAXPACKET;
+ /* Use the lowest common denominator of the members */
TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
- ifp = bif->bif_ifp;
- snprintf(if_xname, sizeof(if_xname), "%s%d",
- ifnet_name(ifp), ifnet_unit(ifp));
- if (strncmp(if_xname, name, sizeof(if_xname)) == 0)
- return (bif);
- }
-
- return (NULL);
-}
-
-/*
- * bridge_lookup_member_if:
- *
- * Lookup a bridge member interface by ifnet*.
- */
-static struct bridge_iflist *
-bridge_lookup_member_if(struct bridge_softc *sc, struct ifnet *member_ifp)
-{
- struct bridge_iflist *bif;
+ ifnet_t ifp = bif->bif_ifp;
- BRIDGE_LOCK_ASSERT(sc);
+ if (ifp == NULL)
+ continue;
- TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
- if (bif->bif_ifp == member_ifp)
- return (bif);
+ if (offload & IFNET_TSO_IPV4) {
+ if (ifp->if_hwassist & IFNET_TSO_IPV4) {
+ 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)
+ tso_v6_mtu = ifp->if_tso_v6_mtu;
+ } else {
+ offload &= ~IFNET_TSO_IPV6;
+ tso_v6_mtu = 0;
+ }
+ }
}
- return (NULL);
-}
+ if (offload != sc->sc_ifp->if_hwassist) {
+ error = ifnet_set_offload(sc->sc_ifp, offload);
+ if (error != 0) {
+#if BRIDGE_DEBUG
+ 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;
+ }
+ /*
+ * For ifnet_set_tso_mtu() sake, the TSO MTU must be at least
+ * as large as the interface MTU
+ */
+ if (sc->sc_ifp->if_hwassist & IFNET_TSO_IPV4) {
+ 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)
+ 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)
+ 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)
+ 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);
+}
+
+/*
+ * bridge_lookup_member:
+ *
+ * Lookup a bridge member interface.
+ */
+static struct bridge_iflist *
+bridge_lookup_member(struct bridge_softc *sc, const char *name)
+{
+ struct bridge_iflist *bif;
+ struct ifnet *ifp;
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
-static errno_t
-bridge_iff_input(void* cookie, ifnet_t ifp, __unused protocol_family_t protocol,
- mbuf_t *data, char **frame_ptr)
+ TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
+ ifp = bif->bif_ifp;
+ if (strcmp(ifp->if_xname, name) == 0)
+ return (bif);
+ }
+
+ return (NULL);
+}
+
+/*
+ * bridge_lookup_member_if:
+ *
+ * Lookup a bridge member interface by ifnet*.
+ */
+static struct bridge_iflist *
+bridge_lookup_member_if(struct bridge_softc *sc, struct ifnet *member_ifp)
+{
+ struct bridge_iflist *bif;
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
+
+ TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
+ if (bif->bif_ifp == member_ifp)
+ return (bif);
+ }
+
+ return (NULL);
+}
+
+static errno_t
+bridge_iff_input(void *cookie, ifnet_t ifp, protocol_family_t protocol,
+ mbuf_t *data, char **frame_ptr)
{
+#pragma unused(protocol)
errno_t error = 0;
struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
struct bridge_softc *sc = bif->bif_sc;
if ((m->m_flags & M_PROTO1))
goto out;
-
- if (*frame_ptr >= (char *)mbuf_datastart(m) && *frame_ptr <= (char *)mbuf_data(m)) {
+
+ if (*frame_ptr >= (char *)mbuf_datastart(m) &&
+ *frame_ptr <= (char *)mbuf_data(m)) {
included = 1;
frmlen = (char *)mbuf_data(m) - *frame_ptr;
}
#if BRIDGE_DEBUG
- if (_if_brige_debug) {
- printf("bridge_iff_input %s%d from %s%d m %p data %p frame %p %s frmlen %lu\n",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
- ifnet_name(ifp), ifnet_unit(ifp),
- m, mbuf_data(m), *frame_ptr, included ? "inside" : "outside", frmlen);
-
- if (_if_brige_debug > 1) {
+ if (if_bridge_debug & BR_DBGF_INPUT) {
+ printf("%s: %s from %s m 0x%llx data 0x%llx frame 0x%llx %s "
+ "frmlen %lu\n", __func__, sc->sc_ifp->if_xname,
+ ifp->if_xname, (uint64_t)VM_KERNEL_ADDRPERM(m),
+ (uint64_t)VM_KERNEL_ADDRPERM(mbuf_data(m)),
+ (uint64_t)VM_KERNEL_ADDRPERM(*frame_ptr),
+ included ? "inside" : "outside", frmlen);
+
+ if (if_bridge_debug & BR_DBGF_MBUF) {
printf_mbuf(m, "bridge_iff_input[", "\n");
- printf_ether_header((struct ether_header *)*frame_ptr);
+ printf_ether_header((struct ether_header *)
+ (void *)*frame_ptr);
printf_mbuf_data(m, 0, 20);
printf("\n");
}
/* Move data pointer to start of frame to the link layer header */
if (included) {
- (void) mbuf_setdata(m, (char *)mbuf_data(m) - frmlen, mbuf_len(m) + frmlen);
+ (void) mbuf_setdata(m, (char *)mbuf_data(m) - frmlen,
+ mbuf_len(m) + frmlen);
(void) mbuf_pkthdr_adjustlen(m, frmlen);
} else {
- printf("bridge_iff_input: frame_ptr outside mbuf\n");
+ printf("%s: frame_ptr outside mbuf\n", __func__);
goto out;
}
-
+
error = bridge_input(ifp, m, *frame_ptr);
-
+
/* Adjust packet back to original */
if (error == 0) {
- (void) mbuf_setdata(m, (char *)mbuf_data(m) + frmlen, mbuf_len(m) - frmlen);
+ (void) mbuf_setdata(m, (char *)mbuf_data(m) + frmlen,
+ mbuf_len(m) - frmlen);
(void) mbuf_pkthdr_adjustlen(m, -frmlen);
}
#if BRIDGE_DEBUG
- if (_if_brige_debug > 1) {
+ if ((if_bridge_debug & BR_DBGF_INPUT) &&
+ (if_bridge_debug & BR_DBGF_MBUF)) {
printf("\n");
printf_mbuf(m, "bridge_iff_input]", "\n");
}
#endif /* BRIDGE_DEBUG */
out:
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
-
- return error;
-}
+ BRIDGE_LOCK_ASSERT_NOTHELD(sc);
+ return (error);
+}
#if BRIDGE_MEMBER_OUT_FILTER
static errno_t
-bridge_iff_output(void *cookie, ifnet_t ifp, __unused protocol_family_t protocol, mbuf_t *data)
+bridge_iff_output(void *cookie, ifnet_t ifp, protocol_family_t protocol,
+ mbuf_t *data)
{
+#pragma unused(protocol)
errno_t error = 0;
struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
struct bridge_softc *sc = bif->bif_sc;
mbuf_t m = *data;
-
+
if ((m->m_flags & M_PROTO1))
goto out;
-
+
#if BRIDGE_DEBUG
- if (_if_brige_debug) {
- printf("bridge_iff_output %s%d from %s%d m %p data %p\n",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
- ifnet_name(ifp), ifnet_unit(ifp),
- m, mbuf_data(m));
+ if (if_bridge_debug & BR_DBGF_OUTPPUT) {
+ 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 */
- error = bridge_output(sc, ifp, m);
+ error = bridge_member_output(sc, ifp, m);
if (error != 0) {
- printf("bridge_iff_output: bridge_output failed error %d\n", error);
+ printf("%s: bridge_member_output failed error %d\n", __func__,
+ error);
}
-out:
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+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, __unused protocol_family_t protocol,
- const struct kev_msg *event_msg)
+static void
+bridge_iff_event(void *cookie, ifnet_t ifp, protocol_family_t protocol,
+ const struct kev_msg *event_msg)
{
+#pragma unused(protocol)
struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
-
- if (event_msg->vendor_code == KEV_VENDOR_APPLE &&
- event_msg->kev_class == KEV_NETWORK_CLASS &&
- event_msg->kev_subclass == KEV_DL_SUBCLASS) {
+ struct bridge_softc *sc = bif->bif_sc;
+
+ if (event_msg->vendor_code == KEV_VENDOR_APPLE &&
+ event_msg->kev_class == KEV_NETWORK_CLASS &&
+ event_msg->kev_subclass == KEV_DL_SUBCLASS) {
+#if BRIDGE_DEBUG
+ 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:
+ case KEV_DL_IF_DETACHED: {
bridge_ifdetach(bif, ifp);
break;
-
+ }
case KEV_DL_LINK_OFF:
case KEV_DL_LINK_ON: {
+ bridge_iflinkevent(ifp);
+#if BRIDGESTP
bstp_linkstate(ifp, event_msg->event_code);
+#endif /* BRIDGESTP */
break;
}
-
case KEV_DL_SIFFLAGS: {
- if (bif->bif_promisc == 0 && (ifp->if_flags & IFF_UP)) {
- errno_t error = ifnet_set_promiscuous(ifp, 1);
+ 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("bridge_iff_event: ifnet_set_promiscuous(%s%d) failed %d\n",
- ifnet_name(ifp), ifnet_unit(ifp), error);
+ printf("%s: "
+ "ifnet_set_promiscuous (%s)"
+ " failed %d\n",
+ __func__, ifp->if_xname,
+ error);
} else {
- bif->bif_promisc = 1;
+ bif->bif_flags |= BIFF_PROMISC;
}
}
break;
}
-
+ case KEV_DL_IFCAP_CHANGED: {
+ BRIDGE_LOCK(sc);
+ bridge_set_tso(sc);
+ BRIDGE_UNLOCK(sc);
+ break;
+ }
default:
break;
}
- }
+ }
}
/*
* Detach an interface from a bridge. Called when a member
* interface is detaching.
*/
-static void
-bridge_iff_detached(void* cookie, __unused ifnet_t ifp)
+static void
+bridge_iff_detached(void *cookie, ifnet_t ifp)
{
struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
-#if BRIDGE_DEBUG
- printf("bridge_iff_detached: %s%d\n",
- ifnet_name(ifp), ifnet_unit(ifp));
-#endif
+#if BRIDGE_DEBUG
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ printf("%s: %s\n", __func__, ifp->if_xname);
+#endif /* BRIDGE_DEBUG */
bridge_ifdetach(bif, ifp);
_FREE(bif, M_DEVBUF);
-
- return;
}
static errno_t
-bridge_proto_input(ifnet_t ifp, __unused protocol_family_t protocol,
- __unused mbuf_t packet, __unused char *header)
+bridge_proto_input(ifnet_t ifp, protocol_family_t protocol, mbuf_t packet,
+ char *header)
{
- printf("bridge_proto_input: unexpected packet from %s%d\n",
- ifnet_name(ifp), ifnet_unit(ifp));
- return 0;
+#pragma unused(protocol, packet, header)
+#if BRIDGE_DEBUG
+ printf("%s: unexpected packet from %s\n", __func__,
+ ifp->if_xname);
+#endif /* BRIDGE_DEBUG */
+ return (0);
}
static int
bridge_attach_protocol(struct ifnet *ifp)
{
- int error;
+ int error;
struct ifnet_attach_proto_param reg;
- printf("bridge_attach_protocol: %s%d\n",
- ifnet_name(ifp), ifnet_unit(ifp));
-
- bzero(®, sizeof(reg));
+#if BRIDGE_DEBUG
+ if (if_bridge_debug & BR_DBGF_LIFECYCLE)
+ printf("%s: %s\n", __func__, ifp->if_xname);
+#endif /* BRIDGE_DEBUG */
+
+ bzero(®, sizeof (reg));
reg.input = bridge_proto_input;
-
+
error = ifnet_attach_protocol(ifp, PF_BRIDGE, ®);
if (error)
- printf("bridge_attach_protocol: ifnet_attach_protocol(%s%d) failed, %d\n",
- ifnet_name(ifp), ifnet_unit(ifp), error);
+ printf("%s: ifnet_attach_protocol(%s) failed, %d\n",
+ __func__, ifp->if_xname, error);
return (error);
}
static int
bridge_detach_protocol(struct ifnet *ifp)
{
- int error;
-
- printf("bridge_detach_protocol: %s%d\n",
- ifnet_name(ifp), ifnet_unit(ifp));
+ int error;
+#if BRIDGE_DEBUG
+ 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)
- printf("bridge_attach_protocol: ifnet_detach_protocol(%s%d) failed, %d\n",
- ifnet_name(ifp), ifnet_unit(ifp), error);
+ printf("%s: ifnet_detach_protocol(%s) failed, %d\n",
+ __func__, ifp->if_xname, 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;
+ struct ifnet *ifs = bif->bif_ifp, *bifp = sc->sc_ifp;
+ int lladdr_changed = 0, error, filt_attached;
+ uint8_t eaddr[ETHER_ADDR_LEN];
+ u_int32_t event_code = 0;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
+ VERIFY(ifs != NULL);
+
+ /*
+ * First, remove the member from the list first so it cannot be found anymore
+ * when we release the bridge lock below
+ */
+ BRIDGE_XLOCK(sc);
+ TAILQ_REMOVE(&sc->sc_iflist, bif, bif_next);
+ BRIDGE_XDROP(sc);
if (!gone) {
switch (ifs->if_type) {
/*
* Take the interface out of promiscuous mode.
*/
- if (bif->bif_promisc)
+ if (bif->bif_flags & BIFF_PROMISC) {
+ /*
+ * Unlock to prevent deadlock with bridge_iff_event() in
+ * case the driver generates an interface event
+ */
+ BRIDGE_UNLOCK(sc);
(void) ifnet_set_promiscuous(ifs, 0);
+ BRIDGE_LOCK(sc);
+ }
break;
case IFT_GIF:
- break;
-
+ /* currently not supported */
+ /* FALLTHRU */
default:
-#ifdef DIAGNOSTIC
- panic("bridge_delete_member: impossible");
-#endif
- break;
+ VERIFY(0);
+ /* NOTREACHED */
}
#if HAS_IF_CAP
#endif
}
- if (bif->bif_proto_attached) {
+ if (bif->bif_flags & BIFF_PROTO_ATTACHED) {
/* Respect lock ordering with DLIL lock */
BRIDGE_UNLOCK(sc);
(void) bridge_detach_protocol(ifs);
BRIDGE_LOCK(sc);
}
- if (bif->bif_flags & IFBIF_STP)
+#if BRIDGESTP
+ if (bif->bif_ifflags & IFBIF_STP)
bstp_disable(&bif->bif_stp);
+#endif /* BRIDGESTP */
- ifs->if_bridge = NULL;
- BRIDGE_XLOCK(sc);
- TAILQ_REMOVE(&sc->sc_iflist, bif, bif_next);
- BRIDGE_XDROP(sc);
-
- ifnet_release(ifs);
+ /*
+ * If removing the interface that gave the bridge its mac address, set
+ * the mac address of the bridge to the address of the next member, or
+ * to its default address if no members are left.
+ */
+ if (bridge_inherit_mac && sc->sc_ifaddr == ifs) {
+ ifnet_release(sc->sc_ifaddr);
+ if (TAILQ_EMPTY(&sc->sc_iflist)) {
+ bcopy(sc->sc_defaddr, eaddr, ETHER_ADDR_LEN);
+ sc->sc_ifaddr = NULL;
+ } else {
+ struct ifnet *fif =
+ 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 */
+ }
+ lladdr_changed = 1;
+ }
#if HAS_IF_CAP
- bridge_mutecaps(sc); /* recalcuate now this interface is removed */
+ bridge_mutecaps(sc); /* recalculate now this interface is removed */
#endif /* HAS_IF_CAP */
+
+ error = bridge_set_tso(sc);
+ if (error != 0) {
+ printf("%s: bridge_set_tso failed %d\n", __func__, error);
+ }
+
bridge_rtdelete(sc, ifs, IFBF_FLUSHALL);
KASSERT(bif->bif_addrcnt == 0,
("%s: %d bridge routes referenced", __func__, bif->bif_addrcnt));
+ filt_attached = bif->bif_flags & BIFF_FILTER_ATTACHED;
+
+ /*
+ * Update link status of the bridge based on its remaining members
+ */
+ event_code = bridge_updatelinkstatus(sc);
+
BRIDGE_UNLOCK(sc);
+
+ if (lladdr_changed &&
+ (error = ifnet_set_lladdr(bifp, eaddr, ETHER_ADDR_LEN)) != 0)
+ printf("%s: ifnet_set_lladdr failed %d\n", __func__, error);
+
+ if (event_code != 0)
+ bridge_link_event(bifp, event_code);
+
+#if BRIDGESTP
bstp_destroy(&bif->bif_stp); /* prepare to free */
- BRIDGE_LOCK(sc);
-
- if (bif->bif_filter_attached) {
- /* Respect lock ordering with DLIL lock */
- BRIDGE_UNLOCK(sc);
+#endif /* BRIDGESTP */
+
+ if (filt_attached)
iflt_detach(bif->bif_iff_ref);
- BRIDGE_LOCK(sc);
- } else {
+ else
_FREE(bif, M_DEVBUF);
- }
+
+ ifs->if_bridge = NULL;
+ ifnet_release(ifs);
+
+ BRIDGE_LOCK(sc);
}
/*
static void
bridge_delete_span(struct bridge_softc *sc, struct bridge_iflist *bif)
{
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
KASSERT(bif->bif_ifp->if_bridge == NULL,
("%s: not a span interface", __func__));
{
struct ifbreq *req = arg;
struct bridge_iflist *bif = NULL;
- struct ifnet *ifs;
- int error = 0;
+ struct ifnet *ifs, *bifp = sc->sc_ifp;
+ int error = 0, lladdr_changed = 0;
+ uint8_t eaddr[ETHER_ADDR_LEN];
struct iff_filter iff;
+ u_int32_t event_code = 0;
ifs = ifunit(req->ifbr_ifsname);
if (ifs == NULL)
if (ifs == bif->bif_ifp)
return (EBUSY);
- /* Allow the first Ethernet member to define the MTU */
- if (ifs->if_type != IFT_GIF) {
- if (TAILQ_EMPTY(&sc->sc_iflist))
- sc->sc_ifp->if_mtu = ifs->if_mtu;
- else if (sc->sc_ifp->if_mtu != ifs->if_mtu) {
- printf("%s%d: invalid MTU for %s%d",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
- ifnet_name(ifs), ifnet_unit(ifs));
- return (EINVAL);
- }
- }
-
if (ifs->if_bridge == sc)
return (EEXIST);
if (ifs->if_bridge != NULL)
return (EBUSY);
- bif = _MALLOC(sizeof(*bif), M_DEVBUF, M_NOWAIT|M_ZERO);
+ switch (ifs->if_type) {
+ case IFT_ETHER:
+ case IFT_L2VLAN:
+ /* permitted interface types */
+ 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->bif_ifp = ifs;
- bif->bif_flags = IFBIF_LEARNING | IFBIF_DISCOVER;
+ ifnet_reference(ifs);
+ bif->bif_ifflags = IFBIF_LEARNING | IFBIF_DISCOVER;
#if HAS_IF_CAP
bif->bif_savedcaps = ifs->if_capenable;
#endif /* HAS_IF_CAP */
bif->bif_sc = sc;
- ifnet_reference(ifs);
+ /* Allow the first Ethernet member to define the MTU */
+ if (TAILQ_EMPTY(&sc->sc_iflist))
+ 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);
+ }
+
+ /*
+ * Assign the interface's MAC address to the bridge if it's the first
+ * member and the MAC address of the bridge has not been changed from
+ * the default (randomly) generated one.
+ */
+ if (bridge_inherit_mac && TAILQ_EMPTY(&sc->sc_iflist) &&
+ !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 */
+ lladdr_changed = 1;
+ }
ifs->if_bridge = sc;
+#if BRIDGESTP
bstp_create(&sc->sc_stp, &bif->bif_stp, bif->bif_ifp);
+#endif /* BRIDGESTP */
+
/*
* XXX: XLOCK HERE!?!
*/
bridge_mutecaps(sc);
#endif /* HAS_IF_CAP */
-
+ bridge_set_tso(sc);
+
+
+ /*
+ * Place the interface into promiscuous mode.
+ */
switch (ifs->if_type) {
case IFT_ETHER:
case IFT_L2VLAN:
- /*
- * Place the interface into promiscuous mode.
- */
error = ifnet_set_promiscuous(ifs, 1);
if (error) {
/* Ignore error when device is not up */
goto out;
error = 0;
} else {
- bif->bif_promisc = 1;
+ bif->bif_flags |= BIFF_PROMISC;
}
break;
- case IFT_GIF:
- break;
-
default:
- error = EINVAL;
- goto out;
+ break;
}
- /*
+ /*
+ * The new member may change the link status of the bridge interface
+ */
+ if (interface_media_active(ifs))
+ bif->bif_flags |= BIFF_MEDIA_ACTIVE;
+ else
+ bif->bif_flags &= ~BIFF_MEDIA_ACTIVE;
+
+ event_code = bridge_updatelinkstatus(sc);
+
+ /*
* Respect lock ordering with DLIL lock for the following operations
*/
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;
#endif /* BRIDGE_MEMBER_OUT_FILTER */
iff.iff_event = bridge_iff_event;
iff.iff_detached = bridge_iff_detached;
- error = iflt_attach(ifs, &iff, &bif->bif_iff_ref);
+ error = dlil_attach_filter(ifs, &iff, &bif->bif_iff_ref, DLIL_IFF_TSO);
if (error != 0) {
- printf("bridge_ioctl_add: iflt_attach failed %d\n", error);
+ printf("%s: iflt_attach failed %d\n", __func__, error);
BRIDGE_LOCK(sc);
goto out;
}
- bif->bif_filter_attached = 1;
+ bif->bif_flags |= BIFF_FILTER_ATTACHED;
/*
* install an dummy "bridge" protocol
*/
if ((error = bridge_attach_protocol(ifs)) != 0) {
if (error != 0) {
- printf("bridge_ioctl_add: bridge_attach_protocol failed %d\n", error);
+ printf("%s: bridge_attach_protocol failed %d\n",
+ __func__, error);
BRIDGE_LOCK(sc);
goto out;
}
}
- bif->bif_proto_attached = 1;
+ bif->bif_flags |= BIFF_PROTO_ATTACHED;
+
+ if (lladdr_changed &&
+ (error = ifnet_set_lladdr(bifp, eaddr, ETHER_ADDR_LEN)) != 0)
+ printf("%s: ifnet_set_lladdr failed %d\n", __func__, error);
+
+ if (event_code != 0)
+ bridge_link_event(bifp, event_code);
BRIDGE_LOCK(sc);
out:
if (error && bif != NULL)
bridge_delete_member(sc, bif, 1);
-
+
return (error);
}
}
static int
-bridge_ioctl_purge(__unused struct bridge_softc *sc, __unused void *arg)
-{
+bridge_ioctl_purge(struct bridge_softc *sc, void *arg)
+{
+#pragma unused(sc, arg)
return (0);
}
return (ENOENT);
bp = &bif->bif_stp;
- req->ifbr_ifsflags = bif->bif_flags;
+ 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;
{
struct ifbreq *req = arg;
struct bridge_iflist *bif;
+#if BRIDGESTP
struct bstp_port *bp;
int error;
+#endif /* BRIDGESTP */
bif = bridge_lookup_member(sc, req->ifbr_ifsname);
if (bif == NULL)
return (ENOENT);
- bp = &bif->bif_stp;
if (req->ifbr_ifsflags & IFBIF_SPAN)
/* SPAN is readonly */
return (EINVAL);
-
+
+#if BRIDGESTP
if (req->ifbr_ifsflags & IFBIF_STP) {
- if ((bif->bif_flags & IFBIF_STP) == 0) {
+ if ((bif->bif_ifflags & IFBIF_STP) == 0) {
error = bstp_enable(&bif->bif_stp);
if (error)
return (error);
}
} else {
- if ((bif->bif_flags & IFBIF_STP) != 0)
+ if ((bif->bif_ifflags & IFBIF_STP) != 0)
bstp_disable(&bif->bif_stp);
}
/* Pass on STP flags */
+ bp = &bif->bif_stp;
bstp_set_edge(bp, req->ifbr_ifsflags & IFBIF_BSTP_EDGE ? 1 : 0);
bstp_set_autoedge(bp, req->ifbr_ifsflags & IFBIF_BSTP_AUTOEDGE ? 1 : 0);
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);
+#endif /* !BRIDGESTP */
/* Save the bits relating to the bridge */
- bif->bif_flags = req->ifbr_ifsflags & IFBIFMASK;
+ bif->bif_ifflags = req->ifbr_ifsflags & IFBIFMASK;
return (0);
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%d", \
- ifnet_name(bif->bif_ifp), ifnet_unit(bif->bif_ifp)); \
- /* 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%d", \
- ifnet_name(bif->bif_ifp), ifnet_unit(bif->bif_ifp)); \
- breq.ifbr_ifsflags = bif->bif_flags; \
- 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); \
+#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
{
struct ifbifconf64 *bifc = arg;
int error = 0;
-
+
BRIDGE_IOCTL_GIFS;
return (error);
return (error);
}
-
-#define BRIDGE_IOCTL_RTS do { \
- struct bridge_rtnode *brt; \
- char *buf, *outbuf; \
- unsigned int count, buflen, len; \
- struct timespec 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%d", \
- ifnet_name(brt->brt_ifp), ifnet_unit(brt->brt_ifp)); \
- 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) { \
- nanouptime(&now); \
- if ((unsigned long)now.tv_sec < brt->brt_expire) \
- bareq.ifba_expire = brt->brt_expire - now.tv_sec; \
- } 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); \
+#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); \
} while (0)
static int
struct ifbaconf64 *bac = arg;
struct ifbareq64 bareq;
int error = 0;
-
+
BRIDGE_IOCTL_RTS;
return (error);
struct ifbaconf32 *bac = arg;
struct ifbareq32 bareq;
int error = 0;
-
+
BRIDGE_IOCTL_RTS;
return (error);
static int
bridge_ioctl_spri(struct bridge_softc *sc, void *arg)
{
+#if BRIDGESTP
struct ifbrparam *param = arg;
return (bstp_set_priority(&sc->sc_stp, param->ifbrp_prio));
+#else /* !BRIDGESTP */
+#pragma unused(sc, arg)
+ return (EOPNOTSUPP);
+#endif /* !BRIDGESTP */
}
static int
static int
bridge_ioctl_sht(struct bridge_softc *sc, void *arg)
{
+#if BRIDGESTP
struct ifbrparam *param = arg;
return (bstp_set_htime(&sc->sc_stp, param->ifbrp_hellotime));
+#else /* !BRIDGESTP */
+#pragma unused(sc, arg)
+ return (EOPNOTSUPP);
+#endif /* !BRIDGESTP */
}
static int
static int
bridge_ioctl_sfd(struct bridge_softc *sc, void *arg)
{
+#if BRIDGESTP
struct ifbrparam *param = arg;
return (bstp_set_fdelay(&sc->sc_stp, param->ifbrp_fwddelay));
+#else /* !BRIDGESTP */
+#pragma unused(sc, arg)
+ return (EOPNOTSUPP);
+#endif /* !BRIDGESTP */
}
static int
static int
bridge_ioctl_sma(struct bridge_softc *sc, void *arg)
{
+#if BRIDGESTP
struct ifbrparam *param = arg;
return (bstp_set_maxage(&sc->sc_stp, param->ifbrp_maxage));
+#else /* !BRIDGESTP */
+#pragma unused(sc, arg)
+ return (EOPNOTSUPP);
+#endif /* !BRIDGESTP */
}
static int
bridge_ioctl_sifprio(struct bridge_softc *sc, void *arg)
{
+#if BRIDGESTP
struct ifbreq *req = arg;
struct bridge_iflist *bif;
return (ENOENT);
return (bstp_set_port_priority(&bif->bif_stp, req->ifbr_priority));
+#else /* !BRIDGESTP */
+#pragma unused(sc, arg)
+ return (EOPNOTSUPP);
+#endif /* !BRIDGESTP */
}
static int
bridge_ioctl_sifcost(struct bridge_softc *sc, void *arg)
{
+#if BRIDGESTP
struct ifbreq *req = arg;
struct bridge_iflist *bif;
return (ENOENT);
return (bstp_set_path_cost(&bif->bif_stp, req->ifbr_path_cost));
+#else /* !BRIDGESTP */
+#pragma unused(sc, arg)
+ return (EOPNOTSUPP);
+#endif /* !BRIDGESTP */
}
static int
switch (ifs->if_type) {
case IFT_ETHER:
- case IFT_GIF:
case IFT_L2VLAN:
break;
+ case IFT_GIF:
+ /* currently not supported */
+ /* FALLTHRU */
default:
return (EINVAL);
}
- bif = _MALLOC(sizeof(*bif), M_DEVBUF, M_NOWAIT|M_ZERO);
+ bif = _MALLOC(sizeof (*bif), M_DEVBUF, M_NOWAIT | M_ZERO);
if (bif == NULL)
return (ENOMEM);
bif->bif_ifp = ifs;
- bif->bif_flags = IFBIF_SPAN;
+ bif->bif_ifflags = IFBIF_SPAN;
ifnet_reference(bif->bif_ifp);
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; \
+#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
bridge_ioctl_grte(struct bridge_softc *sc, void *arg)
{
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_flags & 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_flags & 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; \
+#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; \
+ 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
static int
bridge_ioctl_sproto(struct bridge_softc *sc, void *arg)
{
+#if BRIDGESTP
struct ifbrparam *param = arg;
return (bstp_set_protocol(&sc->sc_stp, param->ifbrp_proto));
+#else /* !BRIDGESTP */
+#pragma unused(sc, arg)
+ return (EOPNOTSUPP);
+#endif /* !BRIDGESTP */
}
static int
bridge_ioctl_stxhc(struct bridge_softc *sc, void *arg)
{
+#if BRIDGESTP
struct ifbrparam *param = arg;
return (bstp_set_holdcount(&sc->sc_stp, param->ifbrp_txhc));
+#else /* !BRIDGESTP */
+#pragma unused(sc, arg)
+ return (EOPNOTSUPP);
+#endif /* !BRIDGESTP */
}
-/*
- * bridge_ifdetach:
- *
- * 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)
-{
- struct bridge_softc *sc = ifp->if_bridge;
-
-#if BRIDGE_DEBUG
- printf("bridge_ifdetach %s%d\n", ifnet_name(ifp), ifnet_unit(ifp));
-#endif
- /* Check if the interface is a bridge member */
- if (sc != NULL) {
- BRIDGE_LOCK(sc);
+static int
+bridge_ioctl_ghostfilter(struct bridge_softc *sc, void *arg)
+{
+ struct ifbrhostfilter *req = arg;
+ struct bridge_iflist *bif;
- bif = bridge_lookup_member_if(sc, ifp);
- if (bif != NULL)
- bridge_delete_member(sc, bif, 1);
+ bif = bridge_lookup_member(sc, req->ifbrhf_ifsname);
+ if (bif == NULL)
+ return (ENOENT);
- BRIDGE_UNLOCK(sc);
- return;
+ bzero(req, sizeof(struct ifbrhostfilter));
+ if (bif->bif_flags & BIFF_HOST_FILTER) {
+ req->ifbrhf_flags |= IFBRHF_ENABLED;
+ bcopy(bif->bif_hf_hwsrc, req->ifbrhf_hwsrca,
+ ETHER_ADDR_LEN);
+ req->ifbrhf_ipsrc = bif->bif_hf_ipsrc.s_addr;
}
+ return (0);
+}
- /* Check if the interface is a span port */
- lck_mtx_lock(bridge_list_mtx);
+static int
+bridge_ioctl_shostfilter(struct bridge_softc *sc, void *arg)
+{
+ struct ifbrhostfilter *req = arg;
+ struct bridge_iflist *bif;
+
+ bif = bridge_lookup_member(sc, req->ifbrhf_ifsname);
+ if (bif == NULL)
+ return (ENOENT);
+
+ if (req->ifbrhf_flags & IFBRHF_ENABLED) {
+ bif->bif_flags |= BIFF_HOST_FILTER;
+
+ if (req->ifbrhf_flags & IFBRHF_HWSRC) {
+ bcopy(req->ifbrhf_hwsrca, bif->bif_hf_hwsrc,
+ ETHER_ADDR_LEN);
+ if (bcmp(req->ifbrhf_hwsrca, ethernulladdr,
+ ETHER_ADDR_LEN) != 0)
+ bif->bif_flags |= BIFF_HF_HWSRC;
+ 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)
+ bif->bif_flags |= BIFF_HF_IPSRC;
+ else
+ bif->bif_flags &= ~BIFF_HF_IPSRC;
+ }
+ } else {
+ bif->bif_flags &= ~(BIFF_HOST_FILTER | BIFF_HF_HWSRC |
+ BIFF_HF_IPSRC);
+ bzero(bif->bif_hf_hwsrc, ETHER_ADDR_LEN);
+ bif->bif_hf_ipsrc.s_addr = INADDR_ANY;
+ }
+
+ return (0);
+}
+
+
+/*
+ * bridge_ifdetach:
+ *
+ * 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)
+{
+ 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 */
+
+ /* Check if the interface is a bridge member */
+ if (sc != NULL) {
+ BRIDGE_LOCK(sc);
+ bif = bridge_lookup_member_if(sc, ifp);
+ 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)
bridge_delete_span(sc, bif);
break;
}
-
BRIDGE_UNLOCK(sc);
}
- lck_mtx_unlock(bridge_list_mtx);
+ lck_mtx_unlock(&bridge_list_mtx);
+}
+
+/*
+ * interface_media_active:
+ *
+ * Tells if an interface media is active.
+ */
+static int
+interface_media_active(struct ifnet *ifp)
+{
+ struct ifmediareq ifmr;
+ int status = 0;
+
+ bzero(&ifmr, sizeof(ifmr));
+ if (ifnet_ioctl(ifp, 0, SIOCGIFMEDIA, &ifmr) == 0) {
+ if ((ifmr.ifm_status & IFM_AVALID) && ifmr.ifm_count > 0)
+ status = ifmr.ifm_status & IFM_ACTIVE ? 1 : 0;
+ }
+
+ return (status);
+}
+
+/*
+ * bridge_updatelinkstatus:
+ *
+ * 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.
+ */
+static u_int32_t
+bridge_updatelinkstatus(struct bridge_softc *sc)
+{
+ struct bridge_iflist *bif;
+ int active_member = 0;
+ u_int32_t event_code = 0;
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
+
+ /*
+ * Find out if we have an active interface
+ */
+ TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
+ if (bif->bif_flags & BIFF_MEDIA_ACTIVE) {
+ active_member = 1;
+ break;
+ }
+ }
+
+ if (active_member && !(sc->sc_flags & SCF_MEDIA_ACTIVE)) {
+ sc->sc_flags |= SCF_MEDIA_ACTIVE;
+ event_code = KEV_DL_LINK_ON;
+ } else if (!active_member && (sc->sc_flags & SCF_MEDIA_ACTIVE)) {
+ sc->sc_flags &= ~SCF_MEDIA_ACTIVE;
+ event_code = KEV_DL_LINK_OFF;
+ }
+
+ return (event_code);
+}
+
+/*
+ * bridge_iflinkevent:
+ */
+static void
+bridge_iflinkevent(struct ifnet *ifp)
+{
+ struct bridge_softc *sc = ifp->if_bridge;
+ struct bridge_iflist *bif;
+ u_int32_t event_code = 0;
+
+#if BRIDGE_DEBUG
+ 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)
+ return;
+
+ BRIDGE_LOCK(sc);
+ bif = bridge_lookup_member_if(sc, ifp);
+ if (bif != NULL) {
+ if (interface_media_active(ifp))
+ bif->bif_flags |= BIFF_MEDIA_ACTIVE;
+ else
+ bif->bif_flags &= ~BIFF_MEDIA_ACTIVE;
+
+ event_code = bridge_updatelinkstatus(sc);
+ }
+ BRIDGE_UNLOCK(sc);
+
+ if (event_code != 0)
+ bridge_link_event(sc->sc_ifp, event_code);
+}
+
+/*
+ * bridge_delayed_callback:
+ *
+ * Makes a delayed call
+ */
+static void
+bridge_delayed_callback(void *param)
+{
+ struct bridge_delayed_call *call = (struct bridge_delayed_call *)param;
+ struct bridge_softc *sc = call->bdc_sc;
+
+#if BRIDGE_DEBUG_DELAYED_CALLBACK
+ if (bridge_delayed_callback_delay > 0) {
+ struct timespec ts;
+
+ ts.tv_sec = bridge_delayed_callback_delay;
+ ts.tv_nsec = 0;
+
+ printf("%s: sleeping for %d seconds\n",
+ __func__, bridge_delayed_callback_delay);
+
+ msleep(&bridge_delayed_callback_delay, NULL, PZERO,
+ __func__, &ts);
+
+ printf("%s: awoken\n", __func__);
+ }
+#endif /* BRIDGE_DEBUG_DELAYED_CALLBACK */
+
+ BRIDGE_LOCK(sc);
+
+#if BRIDGE_DEBUG_DELAYED_CALLBACK
+ 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)
+ (*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.
+ */
+static void
+bridge_schedule_delayed_call(struct bridge_delayed_call *call)
+{
+ uint64_t deadline = 0;
+ struct bridge_softc *sc = call->bdc_sc;
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
+
+ if ((sc->sc_flags & SCF_DETACHING) ||
+ (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);
+ 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)
+ 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)
+ thread_call_func_delayed(
+ (thread_call_func_t)bridge_delayed_callback,
+ call, deadline);
+ 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);
+ }
+}
+
+/*
+ * bridge_cancel_delayed_call:
+ *
+ * Cancel a queued or running delayed call.
+ * If call is running, does not return until the call is done to
+ * prevent race condition with the brigde interface getting destroyed
+ */
+static void
+bridge_cancel_delayed_call(struct bridge_delayed_call *call)
+{
+ boolean_t result;
+ struct bridge_softc *sc = call->bdc_sc;
+
+ /*
+ * The call was never scheduled
+ */
+ if (sc == NULL)
+ return;
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
+
+ call->bdc_flags |= BDCF_CANCELLING;
+
+ while (call->bdc_flags & BDCF_OUTSTANDING) {
+#if BRIDGE_DEBUG
+ 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);
+
+ if (result) {
+ /*
+ * We managed to dequeue the delayed call
+ */
+ call->bdc_flags &= ~BDCF_OUTSTANDING;
+ } else {
+ /*
+ * Wait for delayed call do be done running
+ */
+ msleep(call, &sc->sc_mtx, PZERO, __func__, NULL);
+ }
+ }
+ call->bdc_flags &= ~BDCF_CANCELLING;
+}
+
+/*
+ * bridge_cleanup_delayed_call:
+ *
+ * Dispose resource allocated for a delayed call
+ * Assume the delayed call is not queued or running .
+ */
+static void
+bridge_cleanup_delayed_call(struct bridge_delayed_call *call)
+{
+ boolean_t result;
+ struct bridge_softc *sc = call->bdc_sc;
+
+ /*
+ * The call was never scheduled
+ */
+ if (sc == NULL)
+ return;
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
+
+ VERIFY((call->bdc_flags & BDCF_OUTSTANDING) == 0);
+ VERIFY((call->bdc_flags & BDCF_CANCELLING) == 0);
+
+ if (call->bdc_thread_call != NULL) {
+ result = thread_call_free(call->bdc_thread_call);
+ if (result == FALSE)
+ panic("%s thread_call_free() failed for call %p",
+ __func__, call);
+ call->bdc_thread_call = NULL;
+ }
}
/*
bridge_init(struct ifnet *ifp)
{
struct bridge_softc *sc = (struct bridge_softc *)ifp->if_softc;
- struct timespec ts;
errno_t error;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
if ((ifnet_flags(ifp) & IFF_RUNNING))
- return 0;
-
- ts.tv_sec = bridge_rtable_prune_period;
- ts.tv_nsec = 0;
- bsd_timeout(bridge_timer, sc, &ts);
+ return (0);
error = ifnet_set_flags(ifp, IFF_RUNNING, IFF_RUNNING);
+
+ /*
+ * Calling bridge_aging_timer() is OK as there are no entries to
+ * 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 */
+#endif /* BRIDGESTP */
- return error;
+ return (error);
}
/*
- * bridge_stop:
+ * bridge_ifstop:
*
* Stop the bridge interface.
*/
static void
-bridge_stop(struct ifnet *ifp, __unused int disable)
+bridge_ifstop(struct ifnet *ifp, int disable)
{
+#pragma unused(disable)
struct bridge_softc *sc = ifp->if_softc;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
if ((ifnet_flags(ifp) & IFF_RUNNING) == 0)
return;
- bsd_untimeout(bridge_timer, sc);
+ bridge_cancel_delayed_call(&sc->sc_aging_timer);
+
+#if BRIDGESTP
bstp_stop(&sc->sc_stp);
+#endif /* BRIDGESTP */
bridge_rtflush(sc, IFBF_FLUSHDYN);
* Enqueue a packet on a bridge member interface.
*
*/
-static void
+static int
bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m)
{
int len, error = 0;
short mflags;
struct mbuf *m0;
- /* We may be sending a fragment so traverse the mbuf */
+ VERIFY(dst_ifp != NULL);
+
+ /*
+ * We may be sending a fragment so traverse the mbuf
+ *
+ * NOTE: bridge_fragment() is called only when PFIL_HOOKS is enabled.
+ */
for (; m; m = m0) {
+ errno_t _error;
+ struct flowadv adv = { FADV_SUCCESS };
+
m0 = 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
+ m->m_flags |= M_PROTO1; /* set to avoid loops */
+
+ bridge_finalize_cksum(dst_ifp, m);
#if HAS_IF_CAP
/*
(dst_ifp->if_capenable & IFCAP_VLAN_HWTAGGING) == 0) {
m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
if (m == NULL) {
- printf("%s%d: unable to prepend VLAN header\n",
- ifnet_name(dst_ifp), ifnet_unit(dst_ifp));
- (void) ifnet_stat_increment_out(dst_ifp, 0, 0, 1);
+ printf("%s: %s: unable to prepend VLAN "
+ "header\n", __func__, dst_ifp->if_xname);
+ (void) ifnet_stat_increment_out(dst_ifp,
+ 0, 0, 1);
continue;
}
m->m_flags &= ~M_VLANTAG;
}
#endif /* HAS_IF_CAP */
- error = ifnet_output_raw(dst_ifp, 0, m);
+ _error = dlil_output(dst_ifp, 0, m, NULL, NULL, 1, &adv);
+
+ /* Preserve existing error value */
if (error == 0) {
+ if (_error != 0)
+ error = _error;
+ else if (adv.code == FADV_FLOW_CONTROLLED)
+ error = EQFULL;
+ else if (adv.code == FADV_SUSPENDED)
+ error = EQSUSPENDED;
+ }
+
+ if (_error == 0) {
(void) ifnet_stat_increment_out(sc->sc_ifp, 1, len, 0);
} else {
(void) ifnet_stat_increment_out(sc->sc_ifp, 0, 0, 1);
}
}
- return;
+ return (error);
}
#if HAS_BRIDGE_DUMMYNET
/*
* bridge_dummynet:
*
- * Receive a queued packet from dummynet and pass it on to the output
- * interface.
+ * Receive a queued packet from dummynet and pass it on to the output
+ * interface.
*
* The mbuf has the Ethernet header already attached.
*/
return;
}
- if (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
- || PFIL_HOOKED(&inet6_pfil_hook)
-#endif
- ) {
+ if (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6) {
if (bridge_pfil(&m, sc->sc_ifp, ifp, PFIL_OUT) != 0)
return;
if (m == NULL)
return;
}
- bridge_enqueue(sc, ifp, m);
+ (void) bridge_enqueue(sc, ifp, m);
}
#endif /* HAS_BRIDGE_DUMMYNET */
#if BRIDGE_MEMBER_OUT_FILTER
/*
- * bridge_output:
+ * bridge_member_output:
*
* Send output from a bridge member interface. This
* performs the bridging function for locally originated
* enqueue or free the mbuf before returning.
*/
static int
-bridge_output(struct ifnet *ifp, struct mbuf *m, __unused struct sockaddr *sa,
- __unused struct rtentry *rt)
+bridge_member_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
+ struct rtentry *rt)
{
+#pragma unused(sa, rt)
struct ether_header *eh;
struct ifnet *dst_if;
struct bridge_softc *sc;
uint16_t vlan;
#if BRIDGE_DEBUG
- if (_if_brige_debug)
- printf("bridge_output ifp %p %s%d\n", ifp, ifnet_name(ifp), ifnet_unit(ifp));
+ if (if_bridge_debug & BR_DBGF_OUTPPUT)
+ 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)
BRIDGE_LOCK(sc);
- /* APPLE MODIFICATION
+ /*
+ * APPLE MODIFICATION
* If the packet is an 802.1X ethertype, then only send on the
* original output interface.
*/
dst_if = ifp;
goto sendunicast;
}
-
+
/*
* If bridge is down, but the original output interface is up,
* go ahead and send out that interface. Otherwise, the packet
* tree, make sure the port is in a state that
* allows forwarding.
*/
- if (dst_if != ifp && (bif->bif_flags & IFBIF_STP) &&
+ if (dst_if != ifp && (bif->bif_ifflags & IFBIF_STP) &&
bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
continue;
} else {
mc = m_copypacket(m, M_DONTWAIT);
if (mc == NULL) {
- (void) ifnet_stat_increment_out(sc->sc_ifp, 0, 0, 1);
+ (void) ifnet_stat_increment_out(
+ sc->sc_ifp, 0, 0, 1);
continue;
}
}
- bridge_enqueue(sc, dst_if, mc);
+ (void) bridge_enqueue(sc, dst_if, mc);
}
if (used == 0)
m_freem(m);
}
BRIDGE_UNLOCK(sc);
- bridge_enqueue(sc, dst_if, m);
+ (void) bridge_enqueue(sc, dst_if, m);
return (0);
}
#endif /* BRIDGE_MEMBER_OUT_FILTER */
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
-static struct mbuf* bridge_fix_txcsum( struct mbuf *m )
+/*
+ * Output callback.
+ *
+ * This routine is called externally from above only when if_bridge_txstart
+ * is disabled; otherwise it is called internally by bridge_start().
+ */
+static int
+bridge_output(struct ifnet *ifp, struct mbuf *m)
{
- // basic tests indicate that the vast majority of packets being processed
- // here have an Ethernet header mbuf pre-pended to them (the first case below)
- // the second highest are those where the Ethernet and IP/TCP/UDP headers are
- // all in one mbuf (second case below)
- // the third case has, in fact, never hit for me -- although if I comment out
- // the first two cases, that code works for them, so I consider it a
- // decent general solution
-
- int amt = ETHER_HDR_LEN;
- int hlen = M_CSUM_DATA_IPv4_IPHL( m->m_pkthdr.csum_data );
- int off = M_CSUM_DATA_IPv4_OFFSET( m->m_pkthdr.csum_data );
-
- /*
- * NOTE we should never get vlan-attached packets here;
- * support for those COULD be added, but we don't use them
- * and it really kinda slows things down to worry about them
- */
-
-#ifdef DIAGNOSTIC
- if ( m_tag_find( m, PACKET_TAG_VLAN, NULL ) != NULL )
- {
- printf( "bridge: transmitting packet tagged with VLAN?\n" );
- KASSERT( 0 );
- m_freem( m );
- return NULL;
- }
-#endif
-
- if ( m->m_pkthdr.csum_flags & M_CSUM_IPv4 )
- {
- amt += hlen;
- }
- if ( m->m_pkthdr.csum_flags & M_CSUM_TCPv4 )
- {
- amt += off + sizeof( uint16_t );
- }
-
- if ( m->m_pkthdr.csum_flags & M_CSUM_UDPv4 )
- {
- amt += off + sizeof( uint16_t );
- }
-
- if ( m->m_len == ETHER_HDR_LEN )
- {
- // this is the case where there's an Ethernet header in an mbuf
-
- // the first mbuf is the Ethernet header -- just strip it off and do the checksum
- struct mbuf *m_ip = m->m_next;
-
- // set up m_ip so the cksum operations work
- /* APPLE MODIFICATION 22 Apr 2008 <mvega@apple.com>
- * <rdar://5817385> Clear the m_tag list before setting
- * M_PKTHDR.
- *
- * If this m_buf chain was extended via M_PREPEND(), then
- * m_ip->m_pkthdr is identical to m->m_pkthdr (see
- * M_MOVE_PKTHDR()). The only thing preventing access to this
- * invalid packet header data is the fact that the M_PKTHDR
- * flag is clear, i.e., m_ip->m_flag & M_PKTHDR == 0, but we're
- * about to set the M_PKTHDR flag, so to be safe we initialize,
- * more accurately, we clear, m_ip->m_pkthdr.tags via
- * m_tag_init().
- *
- * Suppose that we do not do this; if m_pullup(), below, fails,
- * then m_ip will be freed along with m_ip->m_pkthdr.tags, but
- * we will also free m soon after, via m_freem(), and
- * consequently attempt to free m->m_pkthdr.tags in the
- * process. The problem is that m->m_pkthdr.tags will have
- * already been freed by virtue of being equal to
- * m_ip->m_pkthdr.tags. Attempts to dereference
- * m->m_pkthdr.tags in m_tag_delete_chain() will result in a
- * panic.
- */
- m_tag_init(m_ip);
- /* END MODIFICATION */
- m_ip->m_flags |= M_PKTHDR;
- m_ip->m_pkthdr.csum_flags = m->m_pkthdr.csum_flags;
- m_ip->m_pkthdr.csum_data = m->m_pkthdr.csum_data;
- m_ip->m_pkthdr.len = m->m_pkthdr.len - ETHER_HDR_LEN;
-
- // set up the header mbuf so we can prepend it back on again later
- m->m_pkthdr.csum_flags = 0;
- m->m_pkthdr.csum_data = 0;
- m->m_pkthdr.len = ETHER_HDR_LEN;
- m->m_next = NULL;
-
-
- // now do the checksums we need -- first IP
- if ( m_ip->m_pkthdr.csum_flags & M_CSUM_IPv4 )
- {
- // make sure the IP header (or at least the part with the cksum) is there
- m_ip = m_pullup( m_ip, sizeof( struct ip ) );
- if ( m_ip == NULL )
- {
- printf( "bridge: failed to flatten header\n ");
- m_freem( m );
- return NULL;
- }
-
- // now do the checksum
- {
- struct ip *ip = mtod( m_ip, struct ip* );
- ip->ip_sum = in_cksum( m_ip, hlen );
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
- printf( "bridge: performed IPv4 checksum\n" );
-#endif
- }
- }
-
- // now do a TCP or UDP delayed checksum
- if ( m_ip->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4) )
- {
- in_delayed_cksum( m_ip );
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
- printf( "bridge: performed TCPv4/UDPv4 checksum\n" );
-#endif
- }
-
- // now attach the ethernet header back onto the IP packet
- m->m_next = m_ip;
- m->m_pkthdr.len += m_length( m_ip );
-
- // clear the M_PKTHDR flags on the ip packet (again, we re-attach later)
- m_ip->m_flags &= ~M_PKTHDR;
-
- // and clear any csum flags
- m->m_pkthdr.csum_flags &= ~(M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_IPv4);
- }
- else if ( m->m_len >= amt )
- {
- // everything fits in the first mbuf, so futz with m->m_data, m->m_len and m->m_pkthdr.len to
- // make it work
- m->m_len -= ETHER_HDR_LEN;
- m->m_data += ETHER_HDR_LEN;
- m->m_pkthdr.len -= ETHER_HDR_LEN;
-
- // now do the checksums we need -- first IP
- if ( m->m_pkthdr.csum_flags & M_CSUM_IPv4 )
- {
- struct ip *ip = mtod( m, struct ip* );
- ip->ip_sum = in_cksum( m, hlen );
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
- printf( "bridge: performed IPv4 checksum\n" );
-#endif
- }
-
- // now do a TCP or UDP delayed checksum
- if ( m->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4) )
- {
- in_delayed_cksum( m );
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
- printf( "bridge: performed TCPv4/UDPv4 checksum\n" );
+ struct bridge_softc *sc = ifnet_softc(ifp);
+ struct ether_header *eh;
+ struct ifnet *dst_if;
+ int error = 0;
+
+ eh = mtod(m, struct ether_header *);
+ dst_if = NULL;
+
+ BRIDGE_LOCK(sc);
+ 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)
+ bridge_bpf_output(ifp, m);
#endif
- }
-
- // now stick the ethernet header back on
- m->m_len += ETHER_HDR_LEN;
- m->m_data -= ETHER_HDR_LEN;
- m->m_pkthdr.len += ETHER_HDR_LEN;
-
- // and clear any csum flags
- m->m_pkthdr.csum_flags &= ~(M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_IPv4);
+
+ if (dst_if == NULL) {
+ /* callee will unlock */
+ bridge_broadcast(sc, ifp, m, 0);
+ } else {
+ BRIDGE_UNLOCK(sc);
+ error = bridge_enqueue(sc, dst_if, m);
}
+
+ return (error);
+}
+
+static void
+bridge_finalize_cksum(struct ifnet *ifp, struct mbuf *m)
+{
+ struct ether_header *eh = mtod(m, struct ether_header *);
+ uint32_t sw_csum, hwcap;
+
+ if (ifp != NULL)
+ hwcap = (ifp->if_hwassist | CSUM_DATA_VALID);
else
- {
- struct mbuf *m_ip;
-
- // general case -- need to simply split it off and deal
-
- // first, calculate how much needs to be made writable (we may have a read-only mbuf here)
- hlen = M_CSUM_DATA_IPv4_IPHL( m->m_pkthdr.csum_data );
-#if PARANOID
- off = M_CSUM_DATA_IPv4_OFFSET( m->m_pkthdr.csum_data );
-
- if ( m->m_pkthdr.csum_flags & M_CSUM_IPv4 )
- {
- amt += hlen;
- }
-
- if ( m->m_pkthdr.csum_flags & M_CSUM_TCPv4 )
- {
- amt += sizeof( struct tcphdr * );
- amt += off;
- }
-
- if ( m->m_pkthdr.csum_flags & M_CSUM_UDPv4 )
- {
- amt += sizeof( struct udphdr * );
- amt += off;
- }
-#endif
-
- // now split the ethernet header off of the IP packet (we'll re-attach later)
- m_ip = m_split( m, ETHER_HDR_LEN, M_NOWAIT );
- if ( m_ip == NULL )
- {
- printf( "bridge_fix_txcsum: could not split ether header\n" );
-
- m_freem( m );
- return NULL;
- }
-
-#if PARANOID
- // make sure that the IP packet is writable for the portion we need
- if ( m_makewritable( &m_ip, 0, amt, M_DONTWAIT ) != 0 )
- {
- printf( "bridge_fix_txcsum: could not make %d bytes writable\n", amt );
-
- m_freem( m );
- m_freem( m_ip );
- return NULL;
- }
-#endif
-
- m_ip->m_pkthdr.csum_flags = m->m_pkthdr.csum_flags;
- m_ip->m_pkthdr.csum_data = m->m_pkthdr.csum_data;
-
- m->m_pkthdr.csum_flags = 0;
- m->m_pkthdr.csum_data = 0;
-
- // now do the checksums we need -- first IP
- if ( m_ip->m_pkthdr.csum_flags & M_CSUM_IPv4 )
- {
- // make sure the IP header (or at least the part with the cksum) is there
- m_ip = m_pullup( m_ip, sizeof( struct ip ) );
- if ( m_ip == NULL )
- {
- printf( "bridge: failed to flatten header\n ");
- m_freem( m );
- return NULL;
- }
-
- // now do the checksum
- {
- struct ip *ip = mtod( m_ip, struct ip* );
- ip->ip_sum = in_cksum( m_ip, hlen );
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
- printf( "bridge: performed IPv4 checksum\n" );
-#endif
+ hwcap = 0;
+
+ /* do in software what the hardware cannot */
+ sw_csum = m->m_pkthdr.csum_flags & ~IF_HWASSIST_CSUM_FLAGS(hwcap);
+ sw_csum &= IF_HWASSIST_CSUM_MASK;
+
+ switch (ntohs(eh->ether_type)) {
+ case ETHERTYPE_IP:
+ if ((hwcap & CSUM_PARTIAL) && !(sw_csum & CSUM_DELAY_DATA) &&
+ (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)) {
+ if (m->m_pkthdr.csum_flags & CSUM_TCP) {
+ uint16_t start =
+ sizeof (*eh) + sizeof (struct ip);
+ uint16_t ulpoff =
+ m->m_pkthdr.csum_data & 0xffff;
+ m->m_pkthdr.csum_flags |=
+ (CSUM_DATA_VALID | CSUM_PARTIAL);
+ m->m_pkthdr.csum_tx_stuff = (ulpoff + start);
+ m->m_pkthdr.csum_tx_start = start;
+ } else {
+ sw_csum |= (CSUM_DELAY_DATA &
+ m->m_pkthdr.csum_flags);
}
}
-
- // now do a TCP or UDP delayed checksum
- if ( m_ip->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4) )
- {
- in_delayed_cksum( m_ip );
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
- printf( "bridge: performed TCPv4/UDPv4 checksum\n" );
-#endif
+ (void) in_finalize_cksum(m, sizeof (*eh), sw_csum);
+ break;
+
+#if INET6
+ case ETHERTYPE_IPV6:
+ if ((hwcap & CSUM_PARTIAL) &&
+ !(sw_csum & CSUM_DELAY_IPV6_DATA) &&
+ (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);
+ uint16_t ulpoff =
+ m->m_pkthdr.csum_data & 0xffff;
+ m->m_pkthdr.csum_flags |=
+ (CSUM_DATA_VALID | CSUM_PARTIAL);
+ m->m_pkthdr.csum_tx_stuff = (ulpoff + start);
+ m->m_pkthdr.csum_tx_start = start;
+ } else {
+ sw_csum |= (CSUM_DELAY_IPV6_DATA &
+ m->m_pkthdr.csum_flags);
+ }
}
-
- // now attach the ethernet header back onto the IP packet
- m->m_next = m_ip;
- m->m_pkthdr.len += m_length( m_ip );
-
- // clear the M_PKTHDR flags on the ip packet (again, we re-attach later)
- m_ip->m_flags &= ~M_PKTHDR;
-
- // and clear any csum flags
- m->m_pkthdr.csum_flags &= ~(M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_IPv4);
- }
-
- return m;
+ (void) in6_finalize_cksum(m, sizeof (*eh), -1, -1, sw_csum);
+ break;
+#endif /* INET6 */
+ }
}
-#endif
/*
* bridge_start:
*
* Start output on a bridge.
*
+ * This routine is invoked by the start worker thread; because we never call
+ * it directly, there is no need do deploy any serialization mechanism other
+ * than what's already used by the worker thread, i.e. this is already single
+ * threaded.
+ *
+ * This routine is called only when if_bridge_txstart is enabled.
*/
-static errno_t
-bridge_start(struct ifnet *ifp, struct mbuf *m)
+static void
+bridge_start(struct ifnet *ifp)
{
- struct bridge_softc *sc = ifnet_softc(ifp);
- struct ether_header *eh;
- struct ifnet *dst_if;
-
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+ struct mbuf *m;
- eh = mtod(m, struct ether_header *);
-
- BRIDGE_LOCK(sc);
-
- if ((m->m_flags & (M_BCAST|M_MCAST)) == 0 &&
- (dst_if = bridge_rtlookup(sc, eh->ether_dhost, 0)) != NULL) {
-
- {
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
- /*
- * APPLE MODIFICATION - if the packet needs a checksum (i.e.,
- * checksum has been deferred for HW support) AND the destination
- * interface doesn't support HW checksums, then we
- * need to fix-up the checksum here
- */
- if (
- ( (m->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_IPv4) ) != 0 ) &&
- ( (dst_if->if_csum_flags_tx & m->m_pkthdr.csum_flags ) != m->m_pkthdr.csum_flags )
- )
- {
- m = bridge_fix_txcsum( m );
- if ( m == NULL )
- {
- goto done;
- }
- }
-
-#else
- if (eh->ether_type == htons(ETHERTYPE_IP))
- mbuf_outbound_finalize(m, PF_INET, sizeof(struct ether_header));
- else
- m->m_pkthdr.csum_flags = 0;
-#endif
- #if NBPFILTER > 0
- if (sc->sc_bpf_output)
- bridge_bpf_output(ifp, m);
- #endif
- BRIDGE_UNLOCK(sc);
- bridge_enqueue(sc, dst_if, m);
- }
- } else
- {
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
-
- /*
- * APPLE MODIFICATION - if the MULTICAST packet needs a checksum (i.e.,
- * checksum has been deferred for HW support) AND at least one destination
- * interface doesn't support HW checksums, then we go ahead and fix it up
- * here, since it doesn't make sense to do it more than once
- */
-
- if (
- (m->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_IPv4)) &&
- /*
- * XXX FIX ME: keep track of whether or not we have any interfaces that
- * do not support checksums (for now, assume we do)
- */
- ( 1 )
- )
- {
- m = bridge_fix_txcsum( m );
- if ( m == NULL )
- {
- goto done;
- }
- }
-#else
- if (eh->ether_type == htons(ETHERTYPE_IP))
- mbuf_outbound_finalize(m, PF_INET, sizeof(struct ether_header));
- else
- m->m_pkthdr.csum_flags = 0;
-#endif
-
- #if NBPFILTER > 0
- if (sc->sc_bpf_output)
- bridge_bpf_output(ifp, m);
- #endif
- bridge_broadcast(sc, ifp, m, 0);
- }
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
-done:
-#endif
+ for (;;) {
+ if (ifnet_dequeue(ifp, &m) != 0)
+ break;
- return 0;
+ (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;
uint8_t *dst;
int error;
- lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
#if BRIDGE_DEBUG
- if (_if_brige_debug)
- printf("bridge_forward %s%d m%p\n", ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp), m);
+ if (if_bridge_debug & BR_DBGF_OUTPPUT)
+ 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;
ifp = sc->sc_ifp;
vlan = VLANTAGOF(m);
- if ((sbif->bif_flags & IFBIF_STP) &&
+ if ((sbif->bif_ifflags & IFBIF_STP) &&
sbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
goto drop;
dst = eh->ether_dhost;
/* If the interface is learning, record the address. */
- if (sbif->bif_flags & IFBIF_LEARNING) {
+ if (sbif->bif_ifflags & IFBIF_LEARNING) {
error = bridge_rtupdate(sc, eh->ether_shost, vlan,
sbif, 0, IFBAF_DYNAMIC);
/*
goto drop;
}
- if ((sbif->bif_flags & IFBIF_STP) != 0 &&
+ if ((sbif->bif_ifflags & IFBIF_STP) != 0 &&
sbif->bif_stp.bp_state == BSTP_IFSTATE_LEARNING)
goto drop;
*/
#if NBPFILTER > 0
if (eh->ether_type == htons(ETHERTYPE_RSN_PREAUTH) ||
- dst_if != NULL || (m->m_flags & (M_BCAST | M_MCAST)) == 0) {
- m->m_pkthdr.rcvif = ifp;
+ dst_if != NULL || (m->m_flags & (M_BCAST | M_MCAST)) == 0) {
+ m->m_pkthdr.rcvif = ifp;
if (sc->sc_bpf_input)
- bridge_bpf_input(ifp, m);
+ bridge_bpf_input(ifp, m);
}
#endif /* NBPFILTER */
#if defined(PFIL_HOOKS)
/* run the packet filter */
- if (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
- || PFIL_HOOKED(&inet6_pfil_hook)
-#endif /* INET6 */
- ) {
+ if (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6) {
BRIDGE_UNLOCK(sc);
if (bridge_pfil(&m, ifp, src_if, PFIL_IN) != 0)
return;
#endif /* PFIL_HOOKS */
if (dst_if == NULL) {
- /*
- * Clear any in-bound checksum flags for this packet.
- */
- mbuf_inbound_modified(m);
-
bridge_broadcast(sc, src_if, m, 1);
-
return;
}
goto drop;
/* Private segments can not talk to each other */
- if (sbif->bif_flags & dbif->bif_flags & IFBIF_PRIVATE)
+ if (sbif->bif_ifflags & dbif->bif_ifflags & IFBIF_PRIVATE)
goto drop;
- if ((dbif->bif_flags & IFBIF_STP) &&
+ if ((dbif->bif_ifflags & IFBIF_STP) &&
dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
goto drop;
#if HAS_DHCPRA_MASK
- /* APPLE MODIFICATION <rdar://6985737> */
+ /* APPLE MODIFICATION <rdar:6985737> */
if ((dst_if->if_extflags & IFEXTF_DHCPRA_MASK) != 0) {
m = ip_xdhcpra_output(dst_if, m);
if (!m) {
BRIDGE_UNLOCK(sc);
#if defined(PFIL_HOOKS)
- if (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
- || PFIL_HOOKED(&inet6_pfil_hook)
-#endif
- ) {
+ if (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6) {
if (bridge_pfil(&m, ifp, dst_if, PFIL_OUT) != 0)
return;
if (m == NULL)
}
#endif /* PFIL_HOOKS */
- /*
- * Clear any in-bound checksum flags for this packet.
- */
- mbuf_inbound_modified(m);
-
- bridge_enqueue(sc, dst_if, m);
+ (void) bridge_enqueue(sc, dst_if, m);
return;
drop:
#if BRIDGE_DEBUG
-char * ether_ntop(char *, size_t , const u_char *);
+char *ether_ntop(char *, size_t, const u_char *);
__private_extern__ char *
ether_ntop(char *buf, size_t len, const u_char *ap)
{
- snprintf(buf, len, "%02x:%02x:%02x:%02x:%02x:%02x",
- ap[0], ap[1], ap[2], ap[3], ap[4], ap[5]);
-
- return buf;
+ snprintf(buf, len, "%02x:%02x:%02x:%02x:%02x:%02x",
+ ap[0], ap[1], ap[2], ap[3], ap[4], ap[5]);
+
+ return (buf);
}
#endif /* BRIDGE_DEBUG */
* bridging if it is not for us.
*/
__private_extern__ errno_t
-bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
+bridge_input(struct ifnet *ifp, struct mbuf *m, void *frame_header)
{
struct bridge_softc *sc = ifp->if_bridge;
struct bridge_iflist *bif, *bif2;
int error;
#if BRIDGE_DEBUG
- if (_if_brige_debug)
- printf("bridge_input: %s%d from %s%d m %p data %p\n",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
- ifnet_name(ifp), ifnet_unit(ifp),
- m, mbuf_data(m));
+ 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_brige_debug)
- printf( "bridge_input: %s%d not running passing along\n",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp));
+ 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;
vlan = VLANTAGOF(m);
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
+ /*
+ * Need to clear the promiscous flags otherwise it will be
+ * dropped by DLIL after processing filters
*/
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_brige_debug)
- printf( "bridge_input: %s%d bridge_lookup_member_if failed\n",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp));
+ 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)
+ printf("%s: %s bridge_host_filter failed\n",
+ __func__, bif->bif_ifp->if_xname);
+ BRIDGE_UNLOCK(sc);
+ return (EJUSTRETURN);
+ }
}
eh = mtod(m, struct ether_header *);
if (m->m_flags & (M_BCAST|M_MCAST)) {
#if BRIDGE_DEBUG
- if (_if_brige_debug)
+ if (if_bridge_debug & BR_DBGF_MCAST)
if ((m->m_flags & M_MCAST))
- printf("mulicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
- eh->ether_dhost[0], eh->ether_dhost[1], eh->ether_dhost[2],
- eh->ether_dhost[3], eh->ether_dhost[4], eh->ether_dhost[5]);
-
+ 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. */
if (memcmp(eh->ether_dhost, bstp_etheraddr,
ETHER_ADDR_LEN) == 0) {
+#if BRIDGESTP
m = bstp_input(&bif->bif_stp, ifp, m);
+#else /* !BRIDGESTP */
+ m_freem(m);
+ m = NULL;
+#endif /* !BRIDGESTP */
if (m == NULL) {
BRIDGE_UNLOCK(sc);
- return EJUSTRETURN;
+ return (EJUSTRETURN);
}
}
- if ((bif->bif_flags & IFBIF_STP) &&
+ 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);
}
- /*
- * Perform the bridge forwarding function with the copy.
+ /*
+ * Perform the bridge forwarding function with the copy.
*
* Note that bridge_forward calls BRIDGE_UNLOCK
*/
bridge_forward(sc, bif, mc);
-
+
/*
* Reinject the mbuf as arriving on the bridge so we have a
* chance at claiming multicast packets. We can not loop back
* here from ether_input as a bridge is never a member of a
* bridge.
*/
- KASSERT(bifp->if_bridge == NULL,
- ("loop created in bridge_input"));
+ VERIFY(bifp->if_bridge == NULL);
mc2 = m_dup(m, M_DONTWAIT);
if (mc2 != NULL) {
/* Keep the layer3 header aligned */
mc2 = m_copyup(mc2, i, ETHER_ALIGN);
}
if (mc2 != NULL) {
- // mark packet as arriving on the bridge
+ /* mark packet as arriving on the bridge */
mc2->m_pkthdr.rcvif = bifp;
- mc2->m_pkthdr.header = mbuf_data(mc2);
-
+ mc2->m_pkthdr.pkt_hdr = mbuf_data(mc2);
+
#if NBPFILTER > 0
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_setdata(mc2,
+ (char *)mbuf_data(mc2) + ETHER_HDR_LEN,
+ mbuf_len(mc2) - ETHER_HDR_LEN);
(void) mbuf_pkthdr_adjustlen(mc2, - ETHER_HDR_LEN);
-
- (void) ifnet_stat_increment_in(bifp, 1, mbuf_pkthdr_len(mc2), 0);
-
+
+ (void) ifnet_stat_increment_in(bifp, 1,
+ mbuf_pkthdr_len(mc2), 0);
+
#if BRIDGE_DEBUG
- if (_if_brige_debug)
- printf( "bridge_input: %s%d mcast for us\n",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp));
+ 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_flags & IFBIF_STP) &&
+ 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 OR_CARP_CHECK_WE_ARE_DST(iface) \
- || ((iface)->if_carp \
- && carp_forus((iface)->if_carp, eh->ether_dhost))
-# define OR_CARP_CHECK_WE_ARE_SRC(iface) \
- || ((iface)->if_carp \
- && carp_forus((iface)->if_carp, eh->ether_shost))
+#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) \
+ ((iface)->if_carp &&\
+ carp_forus((iface)->if_carp, eh->ether_shost))
#else
-# define OR_CARP_CHECK_WE_ARE_DST(iface)
-# define OR_CARP_CHECK_WE_ARE_SRC(iface)
+#define CARP_CHECK_WE_ARE_DST(iface) 0
+#define CARP_CHECK_WE_ARE_SRC(iface) 0
#endif
#ifdef INET6
-# define OR_PFIL_HOOKED_INET6 \
- || PFIL_HOOKED(&inet6_pfil_hook)
+#define PFIL_HOOKED_INET6 PFIL_HOOKED(&inet6_pfil_hook)
#else
-# define OR_PFIL_HOOKED_INET6
+#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) \
- OR_PFIL_HOOKED_INET6)) { \
- if (bridge_pfil(&m, NULL, ifp, \
- PFIL_IN) != 0 || m == NULL) { \
- BRIDGE_UNLOCK(sc); \
- return (NULL); \
- } \
- } \
- } while (0)
+#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)
#endif /* PFIL_HOOKS */
-#define GRAB_OUR_PACKETS(iface) \
- if ((iface)->if_type == IFT_GIF) \
- continue; \
- /* It is destined for us. */ \
- if (memcmp(ifnet_lladdr((iface)), eh->ether_dhost, ETHER_ADDR_LEN) == 0 \
- OR_CARP_CHECK_WE_ARE_DST((iface)) \
- ) { \
+#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); \
+ PFIL_PHYS(sc, iface, m); \
} \
- if (bif->bif_flags & IFBIF_LEARNING) { \
+ 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; \
+ return (EJUSTRETURN); \
} \
} \
m->m_pkthdr.rcvif = iface; \
BRIDGE_UNLOCK(sc); \
- return 0; \
+ return (0); \
} \
\
/* We just received a packet that we sent out. */ \
- if (memcmp(ifnet_lladdr((iface)), eh->ether_shost, ETHER_ADDR_LEN) == 0 \
- OR_CARP_CHECK_WE_ARE_SRC((iface)) \
- ) { \
+ if (memcmp(IF_LLADDR((iface)), eh->ether_shost, \
+ ETHER_ADDR_LEN) == 0 || CARP_CHECK_WE_ARE_SRC((iface))) { \
BRIDGE_UNLOCK(sc); \
- return EJUSTRETURN; \
+ return (EJUSTRETURN); \
}
/*
* bridge, and return the packet back to ether_input for
* local processing.
*/
- if (memcmp(eh->ether_dhost, ifnet_lladdr(bifp),
- ETHER_ADDR_LEN) == 0
- OR_CARP_CHECK_WE_ARE_DST(bifp)) {
-
+ 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);
-
+
/*
* If the interface is learning, and the source
* address is valid and not multicast, record
* the address.
*/
- if ((bif->bif_flags & IFBIF_LEARNING) != 0 &&
- ETHER_IS_MULTICAST(eh->ether_shost) == 0 &&
- (eh->ether_shost[0] | eh->ether_shost[1] |
- eh->ether_shost[2] | eh->ether_shost[3] |
- eh->ether_shost[4] | eh->ether_shost[5]) != 0) {
- (void) bridge_rtupdate(sc, eh->ether_shost,
- vlan, bif, 0, IFBAF_DYNAMIC);
- }
-
+ 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_setdata(m, (char *)mbuf_data(m) + ETHER_HDR_LEN,
+ mbuf_len(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_brige_debug)
- printf( "bridge_input: %s%d packet for bridge\n",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp));
+ 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 the destination of the packet is for the MAC address of
+ * if the destination of the packet is for the MAC address of
* the member interface itself, then we don't need to forward
* it -- just pass it back. Note that it'll likely just be
- * dropped by the stack, but if something else is bound to
+ * dropped by the stack, but if something else is bound to
* the interface directly (for example, the wireless stats
- * protocol -- although that actually uses BPF right now),
+ * protocol -- although that actually uses BPF right now),
* then it will consume the packet
*
- * ALSO, note that we do this check AFTER checking for the
+ * ALSO, note that we do this check AFTER checking for the
* bridge's own MAC address, because the bridge may be
* using the SAME MAC address as one of its interfaces
*/
- if (memcmp(eh->ether_dhost, ifnet_lladdr(ifp),
- ETHER_ADDR_LEN) == 0) {
-
+ if (memcmp(eh->ether_dhost, IF_LLADDR(ifp), ETHER_ADDR_LEN) == 0) {
+
#ifdef VERY_VERY_VERY_DIAGNOSTIC
- printf("bridge_input: not forwarding packet bound for member interface\n" );
+ printf("%s: not forwarding packet bound for member "
+ "interface\n", __func__);
#endif
BRIDGE_UNLOCK(sc);
- return 0;
+ return (0);
}
/* Now check the all bridge members. */
GRAB_OUR_PACKETS(bif2->bif_ifp)
}
-#undef OR_CARP_CHECK_WE_ARE_DST
-#undef OR_CARP_CHECK_WE_ARE_SRC
-#undef OR_PFIL_HOOKED_INET6
+#undef CARP_CHECK_WE_ARE_DST
+#undef CARP_CHECK_WE_ARE_SRC
#undef GRAB_OUR_PACKETS
- /*
- * Perform the bridge forwarding function.
+ /*
+ * Perform the bridge forwarding function.
*
* Note that bridge_forward calls BRIDGE_UNLOCK
*/
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)
#ifdef PFIL_HOOKS
/* Filter on the bridge interface before broadcasting */
- if (runfilt && (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
- || PFIL_HOOKED(&inet6_pfil_hook)
-#endif /* INET6 */
- )) {
+ if (runfilt && (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6)) {
if (bridge_pfil(&m, sc->sc_ifp, NULL, PFIL_OUT) != 0)
goto out;
if (m == NULL)
continue;
/* Private segments can not talk to each other */
- if (sbif && (sbif->bif_flags & dbif->bif_flags & IFBIF_PRIVATE))
+ if (sbif &&
+ (sbif->bif_ifflags & dbif->bif_ifflags & IFBIF_PRIVATE))
continue;
- if ((dbif->bif_flags & IFBIF_STP) &&
+ if ((dbif->bif_ifflags & IFBIF_STP) &&
dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
continue;
- if ((dbif->bif_flags & IFBIF_DISCOVER) == 0 &&
+ if ((dbif->bif_ifflags & IFBIF_DISCOVER) == 0 &&
(m->m_flags & (M_BCAST|M_MCAST)) == 0)
continue;
if ((dst_if->if_flags & IFF_RUNNING) == 0)
continue;
+ if (!(dbif->bif_flags & BIFF_MEDIA_ACTIVE)) {
+ continue;
+ }
+
if (TAILQ_NEXT(dbif, bif_next) == NULL) {
mc = m;
used = 1;
} else {
mc = m_dup(m, M_DONTWAIT);
if (mc == NULL) {
- (void) ifnet_stat_increment_out(sc->sc_ifp, 0, 0, 1);
+ (void) ifnet_stat_increment_out(sc->sc_ifp,
+ 0, 0, 1);
continue;
}
}
* pointer so we do not redundantly filter on the bridge for
* each interface we broadcast on.
*/
- if (runfilt && (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
- || PFIL_HOOKED(&inet6_pfil_hook)
-#endif
- )) {
+ if (runfilt &&
+ (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6)) {
if (used == 0) {
/* Keep the layer3 header aligned */
int i = min(mc->m_pkthdr.len, max_protohdr);
mc = m_copyup(mc, i, ETHER_ALIGN);
if (mc == NULL) {
- (void) ifnet_stat_increment_out(sc->sc_ifp, 0, 0, 1);
+ (void) ifnet_stat_increment_out(
+ sc->sc_ifp, 0, 0, 1);
continue;
}
}
}
#endif /* PFIL_HOOKS */
- bridge_enqueue(sc, dst_if, mc);
+ (void) bridge_enqueue(sc, dst_if, mc);
}
if (used == 0)
m_freem(m);
continue;
}
- bridge_enqueue(sc, dst_if, mc);
+ (void) bridge_enqueue(sc, dst_if, mc);
}
}
-
/*
* bridge_rtupdate:
*
*/
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;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
/* 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)
+ dst[3] == 0 && dst[4] == 0 && dst[5] == 0) != 0)
return (EINVAL);
brt = zalloc_noblock(bridge_rtnode_pool);
if (brt == NULL)
return (ENOMEM);
+ bzero(brt, sizeof(struct bridge_rtnode));
- if (bif->bif_flags & IFBIF_STICKY)
+ if (bif->bif_ifflags & IFBIF_STICKY)
brt->brt_flags = IFBAF_STICKY;
else
brt->brt_flags = IFBAF_DYNAMIC;
}
brt->brt_dst = bif;
bif->bif_addrcnt++;
+#if BRIDGE_DEBUG
+ 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
}
if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC &&
}
if ((flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
- struct timespec now;
-
- nanouptime(&now);
- brt->brt_expire = now.tv_sec + sc->sc_brttimeout;
+ unsigned long now;
+
+ now = (unsigned long) net_uptime();
+ brt->brt_expire = now + sc->sc_brttimeout;
}
if (setflags)
brt->brt_flags = flags;
-
+
return (0);
}
{
struct bridge_rtnode *brt;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
if ((brt = bridge_rtnode_lookup(sc, addr, vlan)) == NULL)
return (NULL);
{
struct bridge_rtnode *brt, *nbrt;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
/* Make sure we actually need to do this. */
if (sc->sc_brtcnt <= sc->sc_brtmax)
}
/*
- * bridge_timer:
+ * bridge_aging_timer:
*
- * Aging timer for the bridge.
+ * Aging periodic timer for the bridge routing table.
*/
static void
-bridge_timer(void *arg)
+bridge_aging_timer(struct bridge_softc *sc)
{
- struct bridge_softc *sc = arg;
-
- BRIDGE_LOCK(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
bridge_rtage(sc);
- BRIDGE_UNLOCK(sc);
-
- if (sc->sc_ifp->if_flags & IFF_RUNNING) {
- struct timespec ts;
-
- ts.tv_sec = bridge_rtable_prune_period;
- ts.tv_nsec = 0;
- bsd_timeout(bridge_timer, sc, &ts);
+ if ((sc->sc_ifp->if_flags & IFF_RUNNING) &&
+ (sc->sc_flags & SCF_DETACHING) == 0) {
+ sc->sc_aging_timer.bdc_sc = sc;
+ sc->sc_aging_timer.bdc_func = bridge_aging_timer;
+ sc->sc_aging_timer.bdc_ts.tv_sec = bridge_rtable_prune_period;
+ bridge_schedule_delayed_call(&sc->sc_aging_timer);
}
}
bridge_rtage(struct bridge_softc *sc)
{
struct bridge_rtnode *brt, *nbrt;
+ unsigned long now;
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
- BRIDGE_LOCK_ASSERT(sc);
+ now = (unsigned long) net_uptime();
LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
- struct timespec now;
-
- nanouptime(&now);
- if ((unsigned long)now.tv_sec >= brt->brt_expire)
+ if (now >= brt->brt_expire)
bridge_rtnode_destroy(sc, brt);
}
}
{
struct bridge_rtnode *brt, *nbrt;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
if (full || (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC)
struct bridge_rtnode *brt;
int found = 0;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
/*
* If vlan is zero then we want to delete for all vlans so the lookup
found = 1;
}
- return (found ? 0 : ENOENT);
-}
-
-/*
- * bridge_rtdelete:
- *
- * Delete routes to a speicifc member interface.
- */
-static void
-bridge_rtdelete(struct bridge_softc *sc, struct ifnet *ifp, int full)
-{
- struct bridge_rtnode *brt, *nbrt;
+ return (found ? 0 : ENOENT);
+}
+
+/*
+ * bridge_rtdelete:
+ *
+ * Delete routes to a speicifc member interface.
+ */
+static void
+bridge_rtdelete(struct bridge_softc *sc, struct ifnet *ifp, int full)
+{
+ struct bridge_rtnode *brt, *nbrt;
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
+
+ LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
+ if (brt->brt_ifp == ifp && (full ||
+ (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC))
+ bridge_rtnode_destroy(sc, brt);
+ }
+}
+
+/*
+ * bridge_rtable_init:
+ *
+ * Initialize the route table for this bridge.
+ */
+static int
+bridge_rtable_init(struct bridge_softc *sc)
+{
+ u_int32_t i;
+
+ 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);
+ }
+ sc->sc_rthash_size = BRIDGE_RTHASH_SIZE;
+
+ 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);
+}
+
+/*
+ * bridge_rthash_delayed_resize:
+ *
+ * Resize the routing table hash on a delayed thread call.
+ */
+static void
+bridge_rthash_delayed_resize(struct bridge_softc *sc)
+{
+ u_int32_t new_rthash_size;
+ struct _bridge_rtnode_list *new_rthash = NULL;
+ struct _bridge_rtnode_list *old_rthash = NULL;
+ u_int32_t i;
+ struct bridge_rtnode *brt;
+ int error = 0;
+
+ BRIDGE_LOCK_ASSERT_HELD(sc);
+
+ /*
+ * Four entries per hash bucket is our ideal load factor
+ */
+ if (sc->sc_brtcnt < sc->sc_rthash_size * 4)
+ goto out;
+
+ /*
+ * Doubling the number of hash buckets may be too simplistic
+ * especially when facing a spike of new entries
+ */
+ new_rthash_size = sc->sc_rthash_size * 2;
+
+ sc->sc_flags |= SCF_RESIZING;
+ BRIDGE_UNLOCK(sc);
+
+ new_rthash = _MALLOC(sizeof (*sc->sc_rthash) * new_rthash_size,
+ M_DEVBUF, M_WAITOK | M_ZERO);
+
+ BRIDGE_LOCK(sc);
+ sc->sc_flags &= ~SCF_RESIZING;
+
+ if (new_rthash == NULL) {
+ error = ENOMEM;
+ goto out;
+ }
+ if ((sc->sc_flags & SCF_DETACHING)) {
+ error = ENODEV;
+ goto out;
+ }
+ /*
+ * Fail safe from here on
+ */
+ old_rthash = sc->sc_rthash;
+ sc->sc_rthash = new_rthash;
+ sc->sc_rthash_size = new_rthash_size;
+
+ /*
+ * Get a new key to force entries to be shuffled around to reduce
+ * the likelihood they will land in the same buckets
+ */
+ sc->sc_rthash_key = RandomULong();
- BRIDGE_LOCK_ASSERT(sc);
+ for (i = 0; i < sc->sc_rthash_size; i++)
+ LIST_INIT(&sc->sc_rthash[i]);
- LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
- if (brt->brt_ifp == ifp && (full ||
- (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC))
- bridge_rtnode_destroy(sc, brt);
+ 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)
+ printf("%s: %s new size %u\n", __func__,
+ sc->sc_ifp->if_xname, sc->sc_rthash_size);
+#endif /* BRIDGE_DEBUG */
+ 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)
+ _FREE(new_rthash, M_DEVBUF);
}
}
/*
- * bridge_rtable_init:
- *
- * Initialize the route table for this bridge.
+ * Resize the number of hash buckets based on the load factor
+ * Currently only grow
+ * Failing to resize the hash table is not fatal
*/
-static int
-bridge_rtable_init(struct bridge_softc *sc)
+static void
+bridge_rthash_resize(struct bridge_softc *sc)
{
- int i;
-
- sc->sc_rthash = _MALLOC(sizeof(*sc->sc_rthash) * BRIDGE_RTHASH_SIZE,
- M_DEVBUF, M_NOWAIT);
- if (sc->sc_rthash == NULL)
- return (ENOMEM);
-
- for (i = 0; i < BRIDGE_RTHASH_SIZE; i++)
- LIST_INIT(&sc->sc_rthash[i]);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
- sc->sc_rthash_key = random();
+ if ((sc->sc_flags & SCF_DETACHING) || (sc->sc_flags & SCF_RESIZING))
+ return;
- LIST_INIT(&sc->sc_rtlist);
+ /*
+ * Four entries per hash bucket is our ideal load factor
+ */
+ 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)
+ return;
- return (0);
+ sc->sc_resize_call.bdc_sc = sc;
+ sc->sc_resize_call.bdc_func = bridge_rthash_delayed_resize;
+ bridge_schedule_delayed_call(&sc->sc_resize_call);
}
/*
static void
bridge_rtable_fini(struct bridge_softc *sc)
{
-
KASSERT(sc->sc_brtcnt == 0,
("%s: %d bridge routes referenced", __func__, sc->sc_brtcnt));
- _FREE(sc->sc_rthash, M_DEVBUF);
+ if (sc->sc_rthash) {
+ _FREE(sc->sc_rthash, M_DEVBUF);
+ sc->sc_rthash = NULL;
+ }
}
/*
mix(a, b, c);
- return (c & BRIDGE_RTHASH_MASK);
+ return (c & BRIDGE_RTHASH_MASK(sc));
}
#undef mix
* vlan id or if zero then just return the first match.
*/
static struct bridge_rtnode *
-bridge_rtnode_lookup(struct bridge_softc *sc, const uint8_t *addr, uint16_t vlan)
+bridge_rtnode_lookup(struct bridge_softc *sc, const uint8_t *addr,
+ uint16_t vlan)
{
struct bridge_rtnode *brt;
uint32_t hash;
int dir;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
hash = bridge_rthash(sc, addr);
LIST_FOREACH(brt, &sc->sc_rthash[hash], brt_hash) {
}
/*
- * bridge_rtnode_insert:
+ * bridge_rtnode_hash:
*
- * Insert the specified bridge node into the route table. We
- * assume the entry is not already in the table.
+ * Insert the specified bridge node into the route hash table.
+ * This is used when adding a new node or to rehash when resizing
+ * the hash table
*/
static int
-bridge_rtnode_insert(struct bridge_softc *sc, struct bridge_rtnode *brt)
+bridge_rtnode_hash(struct bridge_softc *sc, struct bridge_rtnode *brt)
{
struct bridge_rtnode *lbrt;
uint32_t hash;
int dir;
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
hash = bridge_rthash(sc, brt->brt_addr);
do {
dir = bridge_rtnode_addr_cmp(brt->brt_addr, lbrt->brt_addr);
- if (dir == 0 && brt->brt_vlan == lbrt->brt_vlan)
+ if (dir == 0 && brt->brt_vlan == lbrt->brt_vlan) {
+#if BRIDGE_DEBUG
+ 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);
+ }
if (dir > 0) {
LIST_INSERT_BEFORE(lbrt, brt, brt_hash);
goto out;
lbrt = LIST_NEXT(lbrt, brt_hash);
} while (lbrt != NULL);
-#ifdef DIAGNOSTIC
- panic("bridge_rtnode_insert: impossible");
+#if BRIDGE_DEBUG
+ 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);
+}
+
+/*
+ * bridge_rtnode_insert:
+ *
+ * Insert the specified bridge node into the route table. We
+ * assume the entry is not already in the table.
+ */
+static int
+bridge_rtnode_insert(struct bridge_softc *sc, struct bridge_rtnode *brt)
+{
+ int error;
+
+ error = bridge_rtnode_hash(sc, brt);
+ if (error != 0)
+ return (error);
+
LIST_INSERT_HEAD(&sc->sc_rtlist, brt, brt_list);
sc->sc_brtcnt++;
+ bridge_rthash_resize(sc);
+
return (0);
}
static void
bridge_rtnode_destroy(struct bridge_softc *sc, struct bridge_rtnode *brt)
{
- BRIDGE_LOCK_ASSERT(sc);
+ BRIDGE_LOCK_ASSERT_HELD(sc);
LIST_REMOVE(brt, brt_hash);
zfree(bridge_rtnode_pool, brt);
}
+#if BRIDGESTP
/*
* bridge_rtable_expire:
*
* If the age is zero then flush, otherwise set all the expiry times to
* age for the interface
*/
- if (age == 0)
+ if (age == 0) {
bridge_rtdelete(sc, ifp, IFBF_FLUSHDYN);
- else {
+ } else {
+ unsigned long now;
+
+ now = (unsigned long) net_uptime();
+
LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {
- struct timespec now;
-
- nanouptime(&now);
/* Cap the expiry time to 'age' */
if (brt->brt_ifp == ifp &&
- brt->brt_expire > (unsigned long)now.tv_sec + age &&
+ brt->brt_expire > now + age &&
(brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC)
- brt->brt_expire = (unsigned long)now.tv_sec + age;
+ brt->brt_expire = now + age;
}
}
BRIDGE_UNLOCK(sc);
};
if (log_stp)
- log(LOG_NOTICE, "%s%d: state changed to %s on %s%d\n",
- ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
- stpstates[state],
- ifnet_name(ifp), ifnet_unit(ifp));
+ log(LOG_NOTICE, "%s: state changed to %s on %s\n",
+ sc->sc_ifp->if_xname,
+ stpstates[state], ifp->if_xname);
}
+#endif /* BRIDGESTP */
#ifdef PFIL_HOOKS
/*
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);
- }
+ *mp = m_pullup(*mp, i);
+ if (*mp == NULL) {
+ printf("%s: m_pullup failed\n", __func__);
+ return (-1);
+ }
}
eh1 = mtod(*mp, struct ether_header *);
break;
case ETHERTYPE_IP:
-#ifdef INET6
+#if INET6
case ETHERTYPE_IPV6:
#endif /* INET6 */
break;
}
/* Strip off the Ethernet header and keep a copy. */
- m_copydata(*mp, 0, ETHER_HDR_LEN, (caddr_t) &eh2);
+ m_copydata(*mp, 0, ETHER_HDR_LEN, (caddr_t)&eh2);
m_adj(*mp, ETHER_HDR_LEN);
/* 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));
}
/*
case ETHERTYPE_IP:
error = bridge_ip_checkbasic(mp);
break;
-#ifdef INET6
+#if INET6
case ETHERTYPE_IPV6:
error = bridge_ip6_checkbasic(mp);
break;
* packet will return to us via bridge_dummynet().
*/
args.oif = ifp;
- ip_dn_io_ptr(mp, DN_TO_IFB_FWD, &args);
+ ip_dn_io_ptr(mp, DN_TO_IFB_FWD, &args, DN_CLIENT_IPFW);
return (error);
}
*/
if (pfil_bridge && dir == PFIL_OUT && bifp != NULL)
error = pfil_run_hooks(&inet_pfil_hook, mp, bifp,
- dir, NULL);
+ dir, NULL);
if (*mp == NULL || error != 0) /* filter may consume */
break;
if (pfil_member && ifp != NULL)
error = pfil_run_hooks(&inet_pfil_hook, mp, ifp,
- dir, NULL);
+ dir, NULL);
if (*mp == NULL || error != 0) /* filter may consume */
break;
if (pfil_bridge && dir == PFIL_IN && bifp != NULL)
error = pfil_run_hooks(&inet_pfil_hook, mp, bifp,
- dir, NULL);
+ dir, NULL);
if (*mp == NULL || error != 0) /* filter may consume */
break;
i = (*mp)->m_pkthdr.len;
if (i > ifp->if_mtu) {
error = bridge_fragment(ifp, *mp, &eh2, snap,
- &llc1);
+ &llc1);
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)
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
ip->ip_sum = in_cksum(*mp, hlen);
break;
-#ifdef INET6
+#if INET6
case ETHERTYPE_IPV6:
if (pfil_bridge && dir == PFIL_OUT && bifp != NULL)
error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp,
- dir, NULL);
+ dir, NULL);
if (*mp == NULL || error != 0) /* filter may consume */
break;
if (pfil_member && ifp != NULL)
error = pfil_run_hooks(&inet6_pfil_hook, mp, ifp,
- dir, NULL);
+ dir, NULL);
if (*mp == NULL || error != 0) /* filter may consume */
break;
if (pfil_bridge && dir == PFIL_IN && bifp != NULL)
error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp,
- dir, NULL);
+ dir, NULL);
break;
#endif
default:
* Finally, put everything back the way it was and return
*/
if (snap) {
- M_PREPEND(*mp, sizeof(struct llc), M_DONTWAIT);
+ M_PREPEND(*mp, sizeof (struct llc), M_DONTWAIT);
if (*mp == NULL)
return (error);
- bcopy(&llc1, mtod(*mp, caddr_t), sizeof(struct llc));
+ bcopy(&llc1, mtod(*mp, caddr_t), sizeof (struct llc));
}
M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT);
return (error);
}
-
/*
* Perform basic checks on header size since
* pfil assumes ip_input has already processed
return (-1);
if (IP_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) {
- if ((m = m_copyup(m, sizeof(struct ip),
- (max_linkhdr + 3) & ~3)) == NULL) {
+ /* max_linkhdr is already rounded up to nearest 4-byte */
+ if ((m = m_copyup(m, sizeof (struct ip),
+ max_linkhdr)) == NULL) {
/* XXXJRT new stat, please */
ipstat.ips_toosmall++;
goto bad;
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;
}
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);
return (-1);
}
-#ifdef INET6
+#if INET6
/*
* Same as above, but for IPv6.
* Cut-and-pasted from ip6_input.c.
*/
if (IP6_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) {
struct ifnet *inifp = m->m_pkthdr.rcvif;
- if ((m = m_copyup(m, sizeof(struct ip6_hdr),
- (max_linkhdr + 3) & ~3)) == NULL) {
+ /* max_linkhdr is already rounded up to nearest 4-byte */
+ 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;
*/
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);
+ CSUM_DELAY_IP);
if (error)
goto out;
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);
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);
if (m0 == NULL) {
continue;
}
bcopy(eh, mtod(m0, caddr_t), ETHER_HDR_LEN);
- } else
+ } else {
m_freem(m);
+ }
}
if (error == 0)
}
#endif /* PFIL_HOOKS */
+/*
+ * bridge_set_bpf_tap:
+ *
+ * Sets ups the BPF callbacks.
+ */
static errno_t
bridge_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode, bpf_packet_func bpf_callback)
{
struct bridge_softc *sc = (struct bridge_softc *)ifnet_softc(ifp);
-
- //printf("bridge_set_bpf_tap ifp %p mode %d\n", ifp, mode);
-
+
/* 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_INPUT:
sc->sc_bpf_input = 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;
-
+
default:
break;
}
-
- return 0;
+
+ return (0);
}
+/*
+ * bridge_detach:
+ *
+ * Callback when interface has been detached.
+ */
static void
bridge_detach(ifnet_t ifp)
{
struct bridge_softc *sc = (struct bridge_softc *)ifnet_softc(ifp);
-
+
+#if BRIDGESTP
bstp_detach(&sc->sc_stp);
+#endif /* BRIDGESTP */
/* Tear down the routing table. */
bridge_rtable_fini(sc);
-
- lck_mtx_lock(bridge_list_mtx);
+
+ lck_mtx_lock(&bridge_list_mtx);
LIST_REMOVE(sc, sc_list);
- lck_mtx_unlock(bridge_list_mtx);
-
+ lck_mtx_unlock(&bridge_list_mtx);
+
ifnet_release(ifp);
-
- lck_mtx_free(sc->sc_mtx, bridge_lock_grp);
-
+
+ lck_mtx_destroy(&sc->sc_mtx, bridge_lock_grp);
+
_FREE(sc, M_DEVBUF);
- return;
}
-__private_extern__ errno_t bridge_bpf_input(ifnet_t ifp, struct mbuf *m)
+/*
+ * bridge_bpf_input:
+ *
+ * Invoke the input BPF callback if enabled
+ */
+__private_extern__ errno_t
+bridge_bpf_input(ifnet_t ifp, struct mbuf *m)
{
struct bridge_softc *sc = (struct bridge_softc *)ifnet_softc(ifp);
-
+
if (sc->sc_bpf_input) {
- if (mbuf_pkthdr_rcvif(m) != ifp)
- printf("bridge_bpf_input rcvif: %p != ifp %p\n", mbuf_pkthdr_rcvif(m), ifp);
+ if (mbuf_pkthdr_rcvif(m) != ifp) {
+ printf("%s: rcvif: 0x%llx != ifp 0x%llx\n", __func__,
+ (uint64_t)VM_KERNEL_ADDRPERM(mbuf_pkthdr_rcvif(m)),
+ (uint64_t)VM_KERNEL_ADDRPERM(ifp));
+ }
(*sc->sc_bpf_input)(ifp, m);
}
- return 0;
+ return (0);
}
-__private_extern__ errno_t bridge_bpf_output(ifnet_t ifp, struct mbuf *m)
+/*
+ * bridge_bpf_output:
+ *
+ * Invoke the output BPF callback if enabled
+ */
+__private_extern__ errno_t
+bridge_bpf_output(ifnet_t ifp, struct mbuf *m)
{
struct bridge_softc *sc = (struct bridge_softc *)ifnet_softc(ifp);
-
+
if (sc->sc_bpf_output) {
(*sc->sc_bpf_output)(ifp, m);
}
- return 0;
+ return (0);
+}
+
+/*
+ * bridge_link_event:
+ *
+ * Report a data link event on an interface
+ */
+static void
+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];
+ } event;
+
+#if BRIDGE_DEBUG
+ 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);
+ strlcpy(event.if_name, ifnet_name(ifp), IFNAMSIZ);
+ ifnet_event(ifp, &event.header);
+}
+
+#define BRIDGE_HF_DROP(reason, func, line) { \
+ bridge_hostfilter_stats.reason++; \
+ if (if_bridge_debug & BR_DBGF_HOSTFILTER) \
+ printf("%s.%d" #reason, func, line); \
+ error = EINVAL; \
+}
+
+/*
+ * Make sure this is a DHCP or Bootp request that match the host filter
+ */
+static int
+bridge_dhcp_filter(struct bridge_iflist *bif, struct mbuf *m, size_t offset)
+{
+ int error = EINVAL;
+ struct dhcp dhcp;
+
+ /*
+ * Note: We use the dhcp structure because bootp structure definition
+ * is larger and some vendors do not pad the request
+ */
+ error = mbuf_copydata(m, offset, sizeof(struct dhcp), &dhcp);
+ if (error != 0) {
+ BRIDGE_HF_DROP(brhf_dhcp_too_small, __func__, __LINE__);
+ goto done;
+ }
+ if (dhcp.dp_op != BOOTREQUEST) {
+ BRIDGE_HF_DROP(brhf_dhcp_bad_op, __func__, __LINE__);
+ goto done;
+ }
+ /*
+ * The hardware address must be an exact match
+ */
+ if (dhcp.dp_htype != ARPHRD_ETHER) {
+ BRIDGE_HF_DROP(brhf_dhcp_bad_htype, __func__, __LINE__);
+ goto done;
+ }
+ if (dhcp.dp_hlen != ETHER_ADDR_LEN) {
+ BRIDGE_HF_DROP(brhf_dhcp_bad_hlen, __func__, __LINE__);
+ goto done;
+ }
+ if (bcmp(dhcp.dp_chaddr, bif->bif_hf_hwsrc,
+ ETHER_ADDR_LEN) != 0) {
+ BRIDGE_HF_DROP(brhf_dhcp_bad_chaddr, __func__, __LINE__);
+ goto done;
+ }
+ /*
+ * Client address must match the host address or be not specified
+ */
+ if (dhcp.dp_ciaddr.s_addr != bif->bif_hf_ipsrc.s_addr &&
+ dhcp.dp_ciaddr.s_addr != INADDR_ANY) {
+ BRIDGE_HF_DROP(brhf_dhcp_bad_ciaddr, __func__, __LINE__);
+ goto done;
+ }
+ error = 0;
+done:
+ return (error);
+}
+
+static int
+bridge_host_filter(struct bridge_iflist *bif, struct mbuf *m)
+{
+ int error = EINVAL;
+ struct ether_header *eh;
+ static struct in_addr inaddr_any = { .s_addr = INADDR_ANY };
+
+ /*
+ * Check the Ethernet header is large enough
+ */
+ if (mbuf_pkthdr_len(m) < sizeof(struct ether_header)) {
+ BRIDGE_HF_DROP(brhf_ether_too_small, __func__, __LINE__);
+ goto done;
+ }
+ if (mbuf_len(m) < sizeof(struct ether_header) &&
+ mbuf_pullup(&m, sizeof(struct ether_header)) != 0) {
+ BRIDGE_HF_DROP(brhf_ether_pullup_failed, __func__, __LINE__);
+ goto done;
+ }
+ eh = mtod(m, struct ether_header *);
+
+ /*
+ * Restrict the source hardware address
+ */
+ if ((bif->bif_flags & BIFF_HF_HWSRC) == 0 ||
+ bcmp(eh->ether_shost, bif->bif_hf_hwsrc,
+ ETHER_ADDR_LEN) != 0) {
+ BRIDGE_HF_DROP(brhf_bad_ether_srchw_addr, __func__, __LINE__);
+ goto done;
+ }
+
+ /*
+ * Restrict Ethernet protocols to ARP and IP
+ */
+ if (eh->ether_type == htons(ETHERTYPE_ARP)) {
+ struct ether_arp *ea;
+ size_t minlen = sizeof(struct ether_header) +
+ sizeof(struct ether_arp);
+
+ /*
+ * Make the Ethernet and ARP headers contiguous
+ */
+ if (mbuf_pkthdr_len(m) < minlen) {
+ BRIDGE_HF_DROP(brhf_arp_too_small, __func__, __LINE__);
+ goto done;
+ }
+ if (mbuf_len(m) < minlen && mbuf_pullup(&m, minlen) != 0) {
+ BRIDGE_HF_DROP(brhf_arp_pullup_failed,
+ __func__, __LINE__);
+ goto done;
+ }
+ /*
+ * Verify this is an ethernet/ip arp
+ */
+ eh = mtod(m, struct ether_header *);
+ ea = (struct ether_arp *)(eh + 1);
+ if (ea->arp_hrd != htons(ARPHRD_ETHER)) {
+ BRIDGE_HF_DROP(brhf_arp_bad_hw_type,
+ __func__, __LINE__);
+ goto done;
+ }
+ if (ea->arp_pro != htons(ETHERTYPE_IP)) {
+ BRIDGE_HF_DROP(brhf_arp_bad_pro_type,
+ __func__, __LINE__);
+ goto done;
+ }
+ /*
+ * Verify the address lengths are correct
+ */
+ if (ea->arp_hln != ETHER_ADDR_LEN) {
+ BRIDGE_HF_DROP(brhf_arp_bad_hw_len, __func__, __LINE__);
+ goto done;
+ }
+ if (ea->arp_pln != sizeof(struct in_addr)) {
+ BRIDGE_HF_DROP(brhf_arp_bad_pro_len,
+ __func__, __LINE__);
+ goto done;
+ }
+
+ /*
+ * Allow only ARP request or ARP reply
+ */
+ if (ea->arp_op != htons(ARPOP_REQUEST) &&
+ ea->arp_op != htons(ARPOP_REPLY)) {
+ BRIDGE_HF_DROP(brhf_arp_bad_op, __func__, __LINE__);
+ goto done;
+ }
+ /*
+ * Verify source hardware address matches
+ */
+ if (bcmp(ea->arp_sha, bif->bif_hf_hwsrc,
+ ETHER_ADDR_LEN) != 0) {
+ BRIDGE_HF_DROP(brhf_arp_bad_sha, __func__, __LINE__);
+ goto done;
+ }
+ /*
+ * Verify source protocol address:
+ * May be null for an ARP probe
+ */
+ if (bcmp(ea->arp_spa, &bif->bif_hf_ipsrc.s_addr,
+ sizeof(struct in_addr)) != 0 &&
+ bcmp(ea->arp_spa, &inaddr_any,
+ sizeof(struct in_addr)) != 0) {
+ BRIDGE_HF_DROP(brhf_arp_bad_spa, __func__, __LINE__);
+ goto done;
+ }
+ /*
+ *
+ */
+ bridge_hostfilter_stats.brhf_arp_ok += 1;
+ error = 0;
+ } else if (eh->ether_type == htons(ETHERTYPE_IP)) {
+ size_t minlen = sizeof(struct ether_header) + sizeof(struct ip);
+ struct ip iphdr;
+ size_t offset;
+
+ /*
+ * Make the Ethernet and IP headers contiguous
+ */
+ if (mbuf_pkthdr_len(m) < minlen) {
+ BRIDGE_HF_DROP(brhf_ip_too_small, __func__, __LINE__);
+ goto done;
+ }
+ offset = sizeof(struct ether_header);
+ error = mbuf_copydata(m, offset, sizeof(struct ip), &iphdr);
+ if (error != 0) {
+ BRIDGE_HF_DROP(brhf_ip_too_small, __func__, __LINE__);
+ goto done;
+ }
+ /*
+ * Verify the source IP address
+ */
+ if (iphdr.ip_p == IPPROTO_UDP) {
+ struct udphdr udp;
+
+ minlen += sizeof(struct udphdr);
+ if (mbuf_pkthdr_len(m) < minlen) {
+ BRIDGE_HF_DROP(brhf_ip_too_small,
+ __func__, __LINE__);
+ goto done;
+ }
+
+ /*
+ * Allow all zero addresses for DHCP requests
+ */
+ 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__);
+ goto done;
+ }
+ offset = sizeof(struct ether_header) +
+ (IP_VHL_HL(iphdr.ip_vhl) << 2);
+ error = mbuf_copydata(m, offset,
+ sizeof(struct udphdr), &udp);
+ if (error != 0) {
+ BRIDGE_HF_DROP(brhf_ip_too_small,
+ __func__, __LINE__);
+ goto done;
+ }
+ /*
+ * Either it's a Bootp/DHCP packet that we like or
+ * it's a UDP packet from the host IP as source address
+ */
+ if (udp.uh_sport == htons(IPPORT_BOOTPC) &&
+ udp.uh_dport == htons(IPPORT_BOOTPS)) {
+ minlen += sizeof(struct dhcp);
+ if (mbuf_pkthdr_len(m) < minlen) {
+ BRIDGE_HF_DROP(brhf_ip_too_small,
+ __func__, __LINE__);
+ goto done;
+ }
+ offset += sizeof(struct udphdr);
+ error = bridge_dhcp_filter(bif, m, offset);
+ if (error != 0)
+ goto done;
+ } else if (iphdr.ip_src.s_addr == INADDR_ANY) {
+ BRIDGE_HF_DROP(brhf_ip_bad_srcaddr,
+ __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;
+ }
+ /*
+ * Allow only boring IP protocols
+ */
+ if (iphdr.ip_p != IPPROTO_TCP &&
+ iphdr.ip_p != IPPROTO_UDP &&
+ iphdr.ip_p != IPPROTO_ICMP &&
+ iphdr.ip_p != IPPROTO_ESP &&
+ iphdr.ip_p != IPPROTO_AH &&
+ iphdr.ip_p != IPPROTO_GRE) {
+ BRIDGE_HF_DROP(brhf_ip_bad_proto, __func__, __LINE__);
+ goto done;
+ }
+ bridge_hostfilter_stats.brhf_ip_ok += 1;
+ error = 0;
+ } else {
+ BRIDGE_HF_DROP(brhf_bad_ether_type, __func__, __LINE__);
+ goto done;
+ }
+done:
+ if (error != 0) {
+ if (if_bridge_debug & BR_DBGF_HOSTFILTER) {
+ if (m) {
+ printf_mbuf_data(m, 0,
+ sizeof(struct ether_header) +
+ sizeof(struct ip));
+ }
+ printf("\n");
+ }
+
+ if (m != NULL)
+ m_freem(m);
+ }
+ return (error);
}
projects / apple / xnu.git / blobdiff