diff options
| -rw-r--r-- | usr.sbin/rtadvd/config.c | 10 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.conf.5 | 6 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.h | 2 |
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 */ |
