Resetting the mbuf header in if_input_local() was stripping off the

M_LOOP flag.  This broke IPv6 multicast.  Always set M_LOOP when
going through if_input_local() and adjust the flag's comment.
report rzalamena@; OK mpi@

diff --git a/sys/net/if.c b/sys/net/if.c
index c4fca1f..6354484 100644 (file)
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if.c,v 1.503 2017/05/31 05:59:09 mpi Exp $    */
+/*     $OpenBSD: if.c,v 1.504 2017/06/23 11:18:12 bluhm Exp $  */
 /*     $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $  */
 
 /*
@@ -750,6 +750,7 @@ if_input_local(struct ifnet *ifp, struct mbuf *m, sa_family_t af)
        }
 #endif
        m_resethdr(m);
+       m->m_flags |= M_LOOP;
        m->m_pkthdr.ph_ifidx = ifp->if_index;
        m->m_pkthdr.ph_rtableid = ifp->if_rdomain;
 

diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 7f18404..422f49f 100644 (file)
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mbuf.h,v 1.230 2017/06/19 17:58:49 bluhm Exp $        */
+/*     $OpenBSD: mbuf.h,v 1.231 2017/06/23 11:18:12 bluhm Exp $        */
 /*     $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $       */
 
 /*
@@ -186,7 +186,7 @@ struct mbuf {
 
 /* mbuf pkthdr flags, also in m_flags */
 #define M_VLANTAG      0x0020  /* ether_vtag is valid */
-#define M_LOOP         0x0040  /* for Mbuf statistics */
+#define M_LOOP         0x0040  /* packet has been sent from local machine */
 #define M_ACAST                0x0080  /* received as IPv6 anycast */
 #define M_BCAST                0x0100  /* sent/received as link-level broadcast */
 #define M_MCAST                0x0200  /* sent/received as link-level multicast */