From owner-freebsd-current@FreeBSD.ORG Tue Aug 17 02:06:00 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1C2616A4D2; Tue, 17 Aug 2004 02:05:59 +0000 (GMT) Received: from outbound0.sv.meer.net (outbound0.sv.meer.net [205.217.152.13]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF41043D3F; Tue, 17 Aug 2004 02:05:57 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from mail.meer.net (mail.meer.net [209.157.152.14]) i7H25Nr4078182; Mon, 16 Aug 2004 19:05:26 -0700 (PDT) (envelope-from gnn@neville-neil.com) Received: from minion.local.neville-neil.com (h234.neville-neil.com [209.157.133.234] (may be forged)) by mail.meer.net (8.12.10/8.12.2/meer) with ESMTP id i7H24Xwb030140; Mon, 16 Aug 2004 19:04:34 -0700 (PDT) (envelope-from gnn@neville-neil.com) Date: Mon, 16 Aug 2004 19:04:34 -0700 Message-ID: From: "George V. Neville-Neil" To: freebsd-net@freebsd.org User-Agent: Wanderlust/2.10.1 (Watching The Wheels) SEMI/1.14.5 (Awara-Onsen) FLIM/1.14.5 (Demachiyanagi) APEL/10.5 Emacs/21.2 (powerpc-apple-darwin) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: text/plain; charset=US-ASCII cc: freebsd-current@freebsd.org cc: JINMEI Tatuya / =?ISO-2022-JP?B?GyRCP0BMQEMjOkgbKEI=?= Subject: Patch to remove the old IPv6 prefix code from -CURRENT X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2004 02:06:00 -0000 Hi Folks, Enclosed is a patch against the recent -CURRENT tree which removes the in6_prefix code that has already been removed from the Kame tree by the Kame team. I would appreciate it if folks could try this out before we include this in our own tree. I have done some testing of this code on my own machines, but this is only ping6/traceroute6 and ssh type testing. Thanks, George --- sys/conf/files.orig +++ sys/conf/files @@ -1502,7 +1502,6 @@ netinet6/in6_gif.c optional gif inet6 netinet6/in6_ifattach.c optional inet6 netinet6/in6_pcb.c optional inet6 -netinet6/in6_prefix.c optional inet6 netinet6/in6_proto.c optional inet6 netinet6/in6_rmx.c optional inet6 netinet6/in6_src.c optional inet6 --- sys/netinet6/in6.c.orig +++ sys/netinet6/in6.c @@ -1151,7 +1151,6 @@ struct in6_ifaddr *ia; struct ifnet *ifp; { - int plen, iilen; struct in6_ifaddr *oia; int s = splnet(); @@ -1171,12 +1170,6 @@ } } - if (oia->ia6_ifpr) { /* check for safety */ - plen = in6_mask2len(&oia->ia_prefixmask.sin6_addr, NULL); - iilen = (sizeof(oia->ia_prefixmask.sin6_addr) << 3) - plen; - in6_prefix_remove_ifid(iilen, oia); - } - /* * When an autoconfigured address is being removed, release the * reference to the base prefix. Also, since the release might --- sys/netinet6/in6_ifattach.c.orig +++ sys/netinet6/in6_ifattach.c @@ -754,9 +754,6 @@ struct in6_multi *in6m; struct in6_multi *in6m_next; - /* nuke prefix list. this may try to remove some of ifaddrs as well */ - in6_purgeprefix(ifp); - /* remove neighbor management table */ nd6_purge(ifp); --- sys/netinet6/in6_proto.c.orig +++ sys/netinet6/in6_proto.c @@ -102,7 +102,6 @@ #include #include #include -#include #ifdef IPSEC #include --- sys/netinet6/ip6_input.c.orig +++ sys/netinet6/ip6_input.c @@ -105,7 +105,6 @@ #include #include #include -#include #ifdef IPSEC #include @@ -212,10 +211,6 @@ callout_init(&nd6_timer_ch, 0); callout_reset(&nd6_timer_ch, hz, nd6_timer, NULL); - /* router renumbering prefix list maintenance */ - callout_init(&in6_rr_timer_ch, 0); - callout_reset(&in6_rr_timer_ch, hz, in6_rr_timer, NULL); - /* timer for regeneranation of temporary addresses randomize ID */ callout_init(&in6_tmpaddrtimer_ch, 0); callout_reset(&in6_tmpaddrtimer_ch, --- sys/netinet6/nd6.c.orig +++ sys/netinet6/nd6.c @@ -65,7 +65,6 @@ #include #include #include -#include #include #include @@ -1410,26 +1409,6 @@ i++; pr = pr->ndpr_next; } - { - struct rr_prefix *rpp; - - for (rpp = LIST_FIRST(&rr_prefix); rpp; - rpp = LIST_NEXT(rpp, rp_entry)) { - if (i >= PRLSTSIZ) - break; - (void)in6_embedscope(&oprl->prefix[i].prefix, - &pr->ndpr_prefix, NULL, NULL); - oprl->prefix[i].raflags = rpp->rp_raf; - oprl->prefix[i].prefixlen = rpp->rp_plen; - oprl->prefix[i].vltime = rpp->rp_vltime; - oprl->prefix[i].pltime = rpp->rp_pltime; - oprl->prefix[i].if_index = rpp->rp_ifp->if_index; - oprl->prefix[i].expire = rpp->rp_expire; - oprl->prefix[i].advrtrs = 0; - oprl->prefix[i].origin = rpp->rp_origin; - i++; - } - } splx(s); break;