git: 07e4121aa14b - stable/13 - if_bridge: clean up INET/INET6 handling
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 10 May 2024 14:13:00 UTC
The branch stable/13 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=07e4121aa14b4fb2f3def60272eee5d3c6d288a6
commit 07e4121aa14b4fb2f3def60272eee5d3c6d288a6
Author: Lexi Winter <lexi@le-Fay.ORG>
AuthorDate: 2024-04-21 18:56:23 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-05-10 14:09:20 +0000
if_bridge: clean up INET/INET6 handling
The if_bridge contains several instances of:
if (AF_INET code ...
#ifdef INET6
AF_INET6 code ...
#endif
) {
...
Clean this up by adding a couple of macros at the top of the file that
are conditionally defined based on whether INET and/or INET6 are enabled,
which makes the code more readable and easier to maintain.
No functional change intended.
Reviewed by: zlei, markj
MFC after: 1 week
Pull Request: https://github.com/freebsd/freebsd-src/pull/1191
(cherry picked from commit ef84dd8f4926304306d5989ca9afdbf760c6d813)
(cherry picked from commit 2f95e4a01e194428d65572ff3a3c97563120b38a)
---
sys/net/if_bridge.c | 65 +++++++++++++++++++++++++----------------------------
1 file changed, 31 insertions(+), 34 deletions(-)
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index e0fe45e3d326..82526d848f5e 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -141,6 +141,31 @@
extern void nd6_setmtu(struct ifnet *);
#endif
+/*
+ * At various points in the code we need to know if we're hooked into the INET
+ * and/or INET6 pfil. Define some macros to do that based on which IP versions
+ * are enabled in the kernel. This avoids littering the rest of the code with
+ * #ifnet INET6 to avoid referencing V_inet6_pfil_head.
+ */
+#ifdef INET6
+#define PFIL_HOOKED_IN_INET6 PFIL_HOOKED_IN(V_inet6_pfil_head)
+#define PFIL_HOOKED_OUT_INET6 PFIL_HOOKED_OUT(V_inet6_pfil_head)
+#else
+#define PFIL_HOOKED_IN_INET6 false
+#define PFIL_HOOKED_OUT_INET6 false
+#endif
+
+#ifdef INET
+#define PFIL_HOOKED_IN_INET PFIL_HOOKED_IN(V_inet_pfil_head)
+#define PFIL_HOOKED_OUT_INET PFIL_HOOKED_OUT(V_inet_pfil_head)
+#else
+#define PFIL_HOOKED_IN_INET false
+#define PFIL_HOOKED_OUT_INET false
+#endif
+
+#define PFIL_HOOKED_IN_46 (PFIL_HOOKED_IN_INET6 || PFIL_HOOKED_IN_INET)
+#define PFIL_HOOKED_OUT_46 (PFIL_HOOKED_OUT_INET6 || PFIL_HOOKED_OUT_INET)
+
/*
* Size of the route hash table. Must be a power of two.
*/
@@ -2097,11 +2122,7 @@ bridge_dummynet(struct mbuf *m, struct ifnet *ifp)
return;
}
- if (PFIL_HOOKED_OUT(V_inet_pfil_head)
-#ifdef INET6
- || PFIL_HOOKED_OUT(V_inet6_pfil_head)
-#endif
- ) {
+ if (PFIL_HOOKED_OUT_46) {
if (bridge_pfil(&m, sc->sc_ifp, ifp, PFIL_OUT) != 0)
return;
if (m == NULL)
@@ -2385,11 +2406,7 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
ETHER_BPF_MTAP(ifp, m);
/* run the packet filter */
- if (PFIL_HOOKED_IN(V_inet_pfil_head)
-#ifdef INET6
- || PFIL_HOOKED_IN(V_inet6_pfil_head)
-#endif
- ) {
+ if (PFIL_HOOKED_IN_46) {
if (bridge_pfil(&m, ifp, src_if, PFIL_IN) != 0)
return;
if (m == NULL)
@@ -2421,11 +2438,7 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
goto drop;
- if (PFIL_HOOKED_OUT(V_inet_pfil_head)
-#ifdef INET6
- || PFIL_HOOKED_OUT(V_inet6_pfil_head)
-#endif
- ) {
+ if (PFIL_HOOKED_OUT_46) {
if (bridge_pfil(&m, ifp, dst_if, PFIL_OUT) != 0)
return;
if (m == NULL)
@@ -2551,12 +2564,6 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
#define CARP_CHECK_WE_ARE_SRC(iface) false
#endif
-#ifdef INET6
-#define PFIL_HOOKED_INET6 PFIL_HOOKED_IN(V_inet6_pfil_head)
-#else
-#define PFIL_HOOKED_INET6 false
-#endif
-
#define GRAB_OUR_PACKETS(iface) \
if ((iface)->if_type == IFT_GIF) \
continue; \
@@ -2581,8 +2588,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
if_inc_counter(bifp, IFCOUNTER_IPACKETS, 1); \
if_inc_counter(bifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); \
/* Filter on the physical interface. */ \
- if (V_pfil_local_phys && (PFIL_HOOKED_IN(V_inet_pfil_head) || \
- PFIL_HOOKED_INET6)) { \
+ if (V_pfil_local_phys && PFIL_HOOKED_IN_46) { \
if (bridge_pfil(&m, NULL, ifp, \
PFIL_IN) != 0 || m == NULL) { \
return (NULL); \
@@ -2621,7 +2627,6 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
#undef CARP_CHECK_WE_ARE_DST
#undef CARP_CHECK_WE_ARE_SRC
-#undef PFIL_HOOKED_INET6
#undef GRAB_OUR_PACKETS
/* Perform the bridge forwarding function. */
@@ -2653,11 +2658,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
sbif = bridge_lookup_member_if(sc, src_if);
/* Filter on the bridge interface before broadcasting */
- if (runfilt && (PFIL_HOOKED_OUT(V_inet_pfil_head)
-#ifdef INET6
- || PFIL_HOOKED_OUT(V_inet6_pfil_head)
-#endif
- )) {
+ if (runfilt && PFIL_HOOKED_OUT_46) {
if (bridge_pfil(&m, sc->sc_ifp, NULL, PFIL_OUT) != 0)
return;
if (m == NULL)
@@ -2700,11 +2701,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
* pointer so we do not redundantly filter on the bridge for
* each interface we broadcast on.
*/
- if (runfilt && (PFIL_HOOKED_OUT(V_inet_pfil_head)
-#ifdef INET6
- || PFIL_HOOKED_OUT(V_inet6_pfil_head)
-#endif
- )) {
+ if (runfilt && PFIL_HOOKED_OUT_46) {
if (used == 0) {
/* Keep the layer3 header aligned */
i = min(mc->m_pkthdr.len, max_protohdr);