From owner-svn-src-user@FreeBSD.ORG Sun Jun 5 02:20:12 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 334221065675; Sun, 5 Jun 2011 02:20:12 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0AC438FC0C; Sun, 5 Jun 2011 02:20:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p552KBJ0035829; Sun, 5 Jun 2011 02:20:11 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p552KBkR035825; Sun, 5 Jun 2011 02:20:11 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201106050220.p552KBkR035825@svn.freebsd.org> From: Hiroki Sato Date: Sun, 5 Jun 2011 02:20:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222704 - user/hrs/ipv6/usr.sbin/rtadvd X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jun 2011 02:20:12 -0000 Author: hrs Date: Sun Jun 5 02:20:11 2011 New Revision: 222704 URL: http://svn.freebsd.org/changeset/base/222704 Log: Rename: s/noonlinkprefix/noifprefix/. Modified: user/hrs/ipv6/usr.sbin/rtadvd/config.c user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.conf.5 user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h Modified: user/hrs/ipv6/usr.sbin/rtadvd/config.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/config.c Sat Jun 4 23:36:19 2011 (r222703) +++ user/hrs/ipv6/usr.sbin/rtadvd/config.c Sun Jun 5 02:20:11 2011 (r222704) @@ -185,11 +185,11 @@ getconfig(char *intface) if ((forwarding = getinet6sysctl(IPV6CTL_FORWARDING)) < 0) exit(1); - /* gather on-link prefixes from the kernel or not. */ - if (agetflag("noonlinkprefix")) - rai->rai_advonlinkprefix = 0; + /* gather on-link prefixes from the network interfaces. */ + if (agetflag("noifprefix")) + rai->rai_advifprefix = 0; else - rai->rai_advonlinkprefix = 1; + rai->rai_advifprefix = 1; /* get interface information */ if (agetflag("nolladdr")) @@ -439,7 +439,7 @@ getconfig(char *intface) now.tv_sec + pfx->pfx_preflifetime; } } - if (rai->rai_advonlinkprefix && rai->rai_pfxs == 0) + if (rai->rai_advifprefix && rai->rai_pfxs == 0) get_prefix(rai); MAYHAVE(val, "mtu", 0); Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.conf.5 ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.conf.5 Sat Jun 4 23:36:19 2011 (r222703) +++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.conf.5 Sun Jun 5 02:20:11 2011 (r222704) @@ -180,19 +180,19 @@ and advertise the prefixes with the defa Keywords other than .Cm clockskew and -.Cm noonlinkprefix +.Cm noifprefix can be augmented with a number, like .Dq Li prefix2 , to specify multiple prefixes. .Bl -tag -width indent -.It Cm \&noonlinkprefix +.It Cm \&noifprefix (bool) Specifies no prefix on the network interfaces will be advertised. By default .Nm rtadvd automatically gathers on-link prefixes from all of the network interfaces and advertise them. The -.Cm noonlinkprefix +.Cm noifprefix disables that behavior. If this is specified and no .Cm addr Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h Sat Jun 4 23:36:19 2011 (r222703) +++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h Sun Jun 5 02:20:11 2011 (r222704) @@ -185,7 +185,7 @@ struct rainfo { /* interface information */ int rai_ifindex; int rai_advlinkopt; /* bool: whether include link-layer addr opt */ - int rai_advonlinkprefix; /* bool: gather on-link prefixes? */ + int rai_advifprefix; /* bool: gather IF prefixes? */ struct sockaddr_dl *rai_sdl; char rai_ifname[IFNAMSIZ]; u_int32_t rai_phymtu; /* mtu of the physical interface */