From owner-cvs-src-old@FreeBSD.ORG Wed May 27 18:59:08 2009 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA8D91065670 for ; Wed, 27 May 2009 18:59:08 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B07698FC1C for ; Wed, 27 May 2009 18:59:08 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RIx8iE067897 for ; Wed, 27 May 2009 18:59:08 GMT (envelope-from bms@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4RIx8tS067896 for cvs-src-old@freebsd.org; Wed, 27 May 2009 18:59:08 GMT (envelope-from bms@repoman.freebsd.org) Message-Id: <200905271859.n4RIx8tS067896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to bms@repoman.freebsd.org using -f From: Bruce M Simpson Date: Wed, 27 May 2009 18:57:13 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/share/man/man4 Makefile multicast.4 src/sys/netinet6 icmp6.c in6.h in6_mcast.c ip6_input.c mld6.c src/usr.sbin/ifmcstat ifmcstat.8 ifmcstat.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 18:59:09 -0000 bms 2009-05-27 18:57:13 UTC FreeBSD src repository Modified files: share/man/man4 Makefile multicast.4 sys/netinet6 icmp6.c in6.h in6_mcast.c ip6_input.c mld6.c usr.sbin/ifmcstat ifmcstat.8 ifmcstat.c Log: SVN rev 192923 on 2009-05-27 18:57:13Z by bms Merge final round of MLD changes from p4: ip6_input.c, in6.h: * Add netinet6-specific mbuf flag M_RTALERT_MLD, shadowing M_PROTO6. * Always set this flag if HBH Router Alert option is present for MLD, even when not forwarding. icmp6.c: * In icmp6_input(), spell m->m_pkthdr.rcvif as ifp to be consistent. * Use scope ID for verifying input. Do not apply SSM filters here, no inpcb. * Check for M_RTALERT_MLD when validating MLD traffic, as we can't see IPv6 hop options outside of ip6_input(). in6_mcast.c: * Use KAME scope/zone ID in in6_multi. * Update net.inet6.ip6.mcast.filters implementation to use scope IDs for comparisons. * Fix scope ID treatment in multicast socket option processing. Scope IDs passed in from userland will be ignored as other less ambiguous APIs exist for specifying the link. * Tighten userland input checks in IPv6 SSM delta and full-state ops. * Source filter embedded scope IDs need to be revisited, for now just clear them and ignore them on input. * Adapt KAME behaviour of looking up the scope ID in the default zone for multicast leaves, when the interface is ambiguous. mld6.c: * Tighten origin checks on MLD traffic as per RFC3810 Section 6.2: * ip6_src MAY be the unspecified address for MLDv1 reports. * ip6_src MAY have link-local address scope for MLDv1 reports, MLDv1 queries, and MLDv2 queries. * Perform address field validation *before* accepting queries. * Use KAME scope/zone ID in query/report processing. * Break const correctness for mld_v1_input_report(), mld_v1_input_query() as we temporarily modify the input mbuf chain. * Clear the scope ID before handoff to userland MLD daemon. * Fix MLDv1 old querier present timer processing. With the protocol defaults, hosts should revert to MLDv2 after 260s. * Add net.inet6.mld.v1enable sysctl, default to on. ifmcstat.c: * Use sysctl by default; -K requests kvm(3) if so compiled. mld.4: * Connect man page to build. Tested using PCS. Revision Changes Path 1.451 +1 -0 src/share/man/man4/Makefile 1.9 +4 -1 src/share/man/man4/multicast.4 1.108 +25 -20 src/sys/netinet6/icmp6.c 1.56 +1 -0 src/sys/netinet6/in6.h 1.5 +132 -71 src/sys/netinet6/in6_mcast.c 1.121 +14 -2 src/sys/netinet6/ip6_input.c 1.49 +199 -73 src/sys/netinet6/mld6.c 1.13 +10 -12 src/usr.sbin/ifmcstat/ifmcstat.8 1.24 +2 -2 src/usr.sbin/ifmcstat/ifmcstat.c