diff options
| -rw-r--r-- | sys/net/bridge.c | 3 | ||||
| -rw-r--r-- | sys/net/if_ethersubr.c | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/sys/net/bridge.c b/sys/net/bridge.c index 7827a0c18f41..106ddac33ed3 100644 --- a/sys/net/bridge.c +++ b/sys/net/bridge.c @@ -772,6 +772,9 @@ bdg_forward(struct mbuf **m0, struct ether_header *const eh, struct ifnet *dst) m_freem(m); if (canfree == 0) /* m was a copy */ m_freem(*m0); +#ifdef DIAGNOSTIC + printf("bdg_forward: No rules match, so dropping packet!\n"); +#endif *m0 = NULL ; return 0 ; } diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index e8cfa0d63452..3a3b09ab784f 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -446,8 +446,16 @@ ether_input(ifp, eh, m) m_freem(m); return; } - if (bif != BDG_LOCAL) + if (bif != BDG_LOCAL) { bdg_forward(&m, eh, bif); /* needs forwarding */ + /* + * Do not continue if bdg_forward() processed our + * packet (and cleared the mbuf pointer m) or if + * it dropped (m_free'd) the packet itself. + */ + if (m == NULL) + return; + } if (bif == BDG_LOCAL || bif == BDG_BCAST || bif == BDG_MCAST) |