From owner-svn-src-all@FreeBSD.ORG Sun Sep 21 06:45:02 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0168B2CB; Sun, 21 Sep 2014 06:45:02 +0000 (UTC) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 9FE0D1BB; Sun, 21 Sep 2014 06:45:01 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id E93EE25D3A93; Sun, 21 Sep 2014 06:44:57 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id E18FBC76FD3; Sun, 21 Sep 2014 06:44:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id JYdQL0Mt7kbX; Sun, 21 Sep 2014 06:44:54 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4410:f54b:3ba0:feb1:eb3f] (unknown [IPv6:fde9:577b:c1a9:4410:f54b:3ba0:feb1:eb3f]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id F2BE7BE8522; Sun, 21 Sep 2014 06:44:52 +0000 (UTC) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r271916 - head/sys/net From: "Bjoern A. Zeeb" In-Reply-To: <201409210348.s8L3mKfS012477@svn.freebsd.org> Date: Sun, 21 Sep 2014 06:44:34 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: <40476321-398C-4971-91AD-B835CF15581A@lists.zabbadoz.net> References: <201409210348.s8L3mKfS012477@svn.freebsd.org> To: Hiroki Sato X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Sep 2014 06:45:02 -0000 On 21 Sep 2014, at 03:48 , Hiroki Sato wrote: > Author: hrs > Date: Sun Sep 21 03:48:20 2014 > New Revision: 271916 > URL: http://svnweb.freebsd.org/changeset/base/271916 >=20 > Log: > Make net.add_addr_allfibs vnet-local. I guess it was this one: In file included from = /scratch/tmp/bz/head.svn/lib/libc/net/getifaddrs.c:42: = /storage/head/obj//i386.i386/scratch/tmp/bz/head.svn/tmp/usr/include/net/r= oute.h:89:21: error: type specifier missing, defaults to 'int' = [-Werror,-Wimplicit-int] VNET_DECLARE(u_int, rt_add_addr_allfibs); /* Announce interfaces to all = fibs */ ^~~~~~~~~~~~~~~~~~~ = /storage/head/obj//i386.i386/scratch/tmp/bz/head.svn/tmp/usr/include/net/r= oute.h:89:1: error: type specifier missing, defaults to 'int' = [-Werror,-Wimplicit-int] VNET_DECLARE(u_int, rt_add_addr_allfibs); /* Announce interfaces to all = fibs */ ^~~~~~~~~~~~ 2 errors generated. --- getifaddrs.So --- *** [getifaddrs.So] Error code 1 bmake: stopped in /scratch/tmp/bz/head.svn/lib/libc In file included from = /scratch/tmp/bz/head.svn/lib/libc/net/getifmaddrs.c:37: = /storage/head/obj//i386.i386/scratch/tmp/bz/head.svn/tmp/usr/include/net/r= oute.h:89:21: error: type specifier missing, defaults to 'int' = [-Werror,-Wimplicit-int] VNET_DECLARE(u_int, rt_add_addr_allfibs); /* Announce interfaces to all = fibs */ ^~~~~~~~~~~~~~~~~~~ = /storage/head/obj//i386.i386/scratch/tmp/bz/head.svn/tmp/usr/include/net/r= oute.h:89:1: error: type specifier missing, defaults to 'int' = [-Werror,-Wimplicit-int] VNET_DECLARE(u_int, rt_add_addr_allfibs); /* Announce interfaces to all = fibs */ ^~~~~~~~~~~~ >=20 > Modified: > head/sys/net/route.c > head/sys/net/route.h >=20 > Modified: head/sys/net/route.c > = =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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route.c Sun Sep 21 03:00:30 2014 = (r271915) > +++ head/sys/net/route.c Sun Sep 21 03:48:20 2014 = (r271916) > @@ -108,9 +108,9 @@ SYSCTL_UINT(_net, OID_AUTO, fibs, CTLFLA > * always work given the fib can be overridden and prefixes can be = added > * from the network stack context. > */ > -u_int rt_add_addr_allfibs =3D 1; > -SYSCTL_UINT(_net, OID_AUTO, add_addr_allfibs, CTLFLAG_RWTUN, > - &rt_add_addr_allfibs, 0, ""); > +VNET_DEFINE(u_int, rt_add_addr_allfibs) =3D 1; > +SYSCTL_UINT(_net, OID_AUTO, add_addr_allfibs, CTLFLAG_RWTUN | = CTLFLAG_VNET, > + &VNET_NAME(rt_add_addr_allfibs), 0, ""); >=20 > VNET_DEFINE(struct rtstat, rtstat); > #define V_rtstat VNET(rtstat) > @@ -1613,9 +1613,9 @@ rtinit1(struct ifaddr *ifa, int cmd, int > break; > } > if (fibnum =3D=3D RT_ALL_FIBS) { > - if (rt_add_addr_allfibs =3D=3D 0 && cmd =3D=3D = (int)RTM_ADD) { > + if (V_rt_add_addr_allfibs =3D=3D 0 && cmd =3D=3D = (int)RTM_ADD) > startfib =3D endfib =3D ifa->ifa_ifp->if_fib; > - } else { > + else { > startfib =3D 0; > endfib =3D rt_numfibs - 1; > } >=20 > Modified: head/sys/net/route.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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/route.h Sun Sep 21 03:00:30 2014 = (r271915) > +++ head/sys/net/route.h Sun Sep 21 03:48:20 2014 = (r271916) > @@ -34,6 +34,7 @@ > #define _NET_ROUTE_H_ >=20 > #include > +#include >=20 > /* > * Kernel resident routing tables. > @@ -85,7 +86,8 @@ struct rt_metrics { > #define RT_DEFAULT_FIB 0 /* Explicitly mark fib=3D0 = restricted cases */ > #define RT_ALL_FIBS -1 /* Announce event for every fib = */ > extern u_int rt_numfibs; /* number of usable routing tables */ > -extern u_int rt_add_addr_allfibs; /* Announce interfaces to all = fibs */ > +VNET_DECLARE(u_int, rt_add_addr_allfibs); /* Announce interfaces to = all fibs */ > +#define V_rt_add_addr_allfibs VNET(rt_add_addr_allfibs) >=20 > /* > * We distinguish between routes to hosts and routes to networks, >=20 =97=20 Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 1983