summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2011-06-05 02:20:11 +0000
committerhrs <hrs@FreeBSD.org>2011-06-05 02:20:11 +0000
commit58336f4cc22793545c7611a892992e32372b3c53 (patch)
treebb9b61571a7a7be21215413843675685094c007e /usr.sbin
parentd93e07bcd65d3138e2ba1c72a3c1c84e7127eb43 (diff)
downloadFreeBSD-src-58336f4cc22793545c7611a892992e32372b3c53.zip
FreeBSD-src-58336f4cc22793545c7611a892992e32372b3c53.tar.gz
Rename: s/noonlinkprefix/noifprefix/.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/rtadvd/config.c10
-rw-r--r--usr.sbin/rtadvd/rtadvd.conf.56
-rw-r--r--usr.sbin/rtadvd/rtadvd.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index e6411ed..f7a4bbe 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -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);
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index 43e65e9..ba2f490 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -180,19 +180,19 @@ and advertise the prefixes with the default parameters.
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
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index e408690..f65a837 100644
--- a/usr.sbin/rtadvd/rtadvd.h
+++ b/usr.sbin/rtadvd/rtadvd.h
@@ -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 */
OpenPOWER on IntegriCloud