看板 FB_bugs 關於我們 聯絡資訊
The problem seems to be that M_SKIP_FIREWALL (macro of M_PROTO3) is = cleared through m_clrprotoflags(), i.e. not transferred between the = layers. This is a reversion of the 254519 on 10.0-STABLE: Index: netinet/ip_var.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- netinet/ip_var.h=A0=A0=A0 (revision 262459) +++ netinet/ip_var.h=A0=A0=A0 (working copy) @@ -163,12 +163,10 @@ =A0#define IP_ALLOWBROADCAST=A0=A0=A0 SO_BROADCAST=A0=A0=A0 /* 0x20 can sen= d broadcast packets */ =A0 =A0/* - * IPv4 protocol layer specific mbuf flags. + * mbuf flag used by ip_fastfwd =A0 */ =A0#define=A0=A0=A0 M_FASTFWD_OURS=A0=A0=A0 =A0=A0=A0 M_PROTO1=A0=A0=A0 /* = changed dst to local */ =A0#define=A0=A0=A0 M_IP_NEXTHOP=A0=A0=A0 =A0=A0=A0 M_PROTO2=A0=A0=A0 /* ex= plicit ip nexthop */ -#define=A0=A0=A0 M_SKIP_FIREWALL=A0=A0=A0 =A0=A0=A0 M_PROTO3=A0=A0=A0 /* s= kip firewall processing, -=A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0 keep in= sync with IP6 */ =A0#define=A0=A0=A0 M_IP_FRAG=A0=A0=A0 =A0=A0=A0 M_PROTO4=A0=A0=A0 /* fragm= ent reassembly */ =A0 =A0#ifdef __NO_STRICT_ALIGNMENT Index: netinet6/ip6_var.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- netinet6/ip6_var.h=A0=A0=A0 (revision 262459) +++ netinet6/ip6_var.h=A0=A0=A0 (working copy) @@ -293,12 +293,7 @@ =A0#define=A0=A0=A0 IPV6_FORWARDING=A0=A0=A0 =A0=A0=A0 0x02=A0=A0=A0 /* mos= t of IPv6 header exists */ =A0#define=A0=A0=A0 IPV6_MINMTU=A0=A0=A0 =A0=A0=A0 0x04=A0=A0=A0 /* use min= imum MTU (IPV6_USE_MIN_MTU) */ =A0 -/* - * IPv6 protocol layer specific mbuf flags. - */ -#define=A0=A0=A0 M_IP6_NEXTHOP=A0=A0=A0 =A0=A0=A0 M_PROTO2=A0=A0=A0 /* exp= licit ip nexthop */ -#define=A0=A0=A0 M_SKIP_FIREWALL=A0=A0=A0 =A0=A0=A0 M_PROTO3=A0=A0=A0 /* s= kip firewall processing, -=A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0 keep in= sync with IPv4 */ +#define=A0=A0=A0 M_IP6_NEXTHOP=A0=A0=A0 =A0=A0=A0 M_PROTO7=A0=A0=A0 /* exp= licit ip nexthop */ =A0 =A0#ifdef __NO_STRICT_ALIGNMENT =A0#define IP6_HDR_ALIGNED_P(ip)=A0=A0=A0 1 Index: sys/mbuf.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/mbuf.h=A0=A0=A0 (revision 262459) +++ sys/mbuf.h=A0=A0=A0 (working copy) @@ -235,7 +235,7 @@ =A0#define=A0=A0=A0 M_PROTO9=A0=A0=A0 0x00100000 /* protocol-specific */ =A0#define=A0=A0=A0 M_PROTO10=A0=A0=A0 0x00200000 /* protocol-specific */ =A0#define=A0=A0=A0 M_PROTO11=A0=A0=A0 0x00400000 /* protocol-specific */ -#define=A0=A0=A0 M_PROTO12=A0=A0=A0 0x00800000 /* protocol-specific */ +#define=A0=A0=A0 M_SKIP_FIREWALL=A0=A0=A0 0x00800000 =A0 =A0/* =A0 * Flags to purge when crossing layers. @@ -242,13 +242,13 @@ =A0 */ =A0#define=A0=A0=A0 M_PROTOFLAGS \ =A0=A0=A0=A0 (M_PROTO1|M_PROTO2|M_PROTO3|M_PROTO4|M_PROTO5|M_PROTO6|M_PROTO= 7|M_PROTO8|\ -=A0=A0=A0=A0 M_PROTO9|M_PROTO10|M_PROTO11|M_PROTO12) +=A0=A0=A0=A0 M_PROTO9|M_PROTO10|M_PROTO11) =A0 /* =A0 * Flags preserved when copying m_pkthdr. =A0 */ =A0#define M_COPYFLAGS \ -=A0=A0=A0 (M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_VLANTAG|M_PROMISC| \ +=A0=A0=A0 (M_PKTHDR|M_EOR|M_RDONLY|M_SKIP_FIREWALL|M_BCAST|M_MCAST|M_VLANT= AG|M_PROMISC| \ =A0=A0=A0=A0=A0 M_PROTOFLAGS) =A0/* @@ -255,12 +255,12 @@ =A0 * Mbuf flag description for use with printf(9) %b identifier. =A0 */ =A0#define=A0=A0=A0 M_FLAG_BITS \ -=A0=A0=A0 "\20\1M_EXT\2M_PKTHDR\3M_EOR\4M_RDONLY\5M_BCAST\6M_MCAST" \ -=A0=A0=A0 "\7M_PROMISC\10M_VLANTAG\11M_FLOWID" +=A0=A0=A0 "\20\1M_EXT\2M_PKTHDR\3M_EOR\4M_RDONLY\5M_SKIP_FIREWALL\6M_BCAST= \7M_MCAST" \ +=A0=A0=A0 "\8M_PROMISC\10M_VLANTAG\11M_FLOWID" =A0#define=A0=A0=A0 M_FLAG_PROTOBITS \ =A0=A0=A0=A0 "\15M_PROTO1\16M_PROTO2\17M_PROTO3\20M_PROTO4\21M_PROTO5" \ =A0=A0=A0=A0 "\22M_PROTO6\23M_PROTO7\24M_PROTO8\25M_PROTO9\26M_PROTO10" \ -=A0=A0=A0 "\27M_PROTO11\30M_PROTO12" +=A0=A0=A0 "\27M_PROTO11" =A0#define=A0=A0=A0 M_FLAG_PRINTF (M_FLAG_BITS M_FLAG_PROTOBITS) =A0 =A0/* _______________________________________________ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscribe@freebsd.org"