Attachment #242978 for bug #265761

Lines 379-384 getconfig(struct ifinfo *ifi) Link Here

(-)b/usr.sbin/rtadvd/config.c (+6 lines)
379	else	379	else
380	rai->rai_advifprefix = 1;	380	rai->rai_advifprefix = 1;
381		381
		382	/* deprecate on shutdown? */
		383	if (agetflag("nodeprecate"))
		384	rai->rai_deprecate = 0;
		385	else
		386	rai->rai_deprecate = 1;
		387
382	/* get interface information */	388	/* get interface information */
383	if (agetflag("nolladdr"))	389	if (agetflag("nolladdr"))
384	rai->rai_advlinkopt = 0;	390	rai->rai_advlinkopt = 0;

Lines 369-374 rtadvd_shutdown(void) Link Here

(-)b/usr.sbin/rtadvd/rtadvd.c (+7 lines)
369	{	369	{
370	struct ifinfo *ifi;	370	struct ifinfo *ifi;
371	struct rainfo *rai;	371	struct rainfo *rai;
		372	struct prefix *prefix;
372	struct rdnss *rdn;	373	struct rdnss *rdn;
373	struct dnssl *dns;	374	struct dnssl *dns;
374		375
Lines 411-416 rtadvd_shutdown(void) Link Here
411		412
412	TAILQ_FOREACH(rai, &railist, rai_next) {	413	TAILQ_FOREACH(rai, &railist, rai_next) {
413	rai->rai_lifetime = 0;	414	rai->rai_lifetime = 0;
		415	if (rai->rai_deprecate) {
		416	TAILQ_FOREACH(prefix, &rai->rai_prefix, pfx_next) {
		417	prefix->pfx_validlifetime = 0;
		418	prefix->pfx_preflifetime = 0;
		419	}
		420	}
414	TAILQ_FOREACH(rdn, &rai->rai_rdnss, rd_next)	421	TAILQ_FOREACH(rdn, &rai->rai_rdnss, rd_next)
415	rdn->rd_ltime = 0;	422	rdn->rd_ltime = 0;
416	TAILQ_FOREACH(dns, &rai->rai_dnssl, dn_next)	423	TAILQ_FOREACH(dns, &rai->rai_dnssl, dn_next)




The default value is 3/2 of the interval time.
.El
.Pp
The following item controls prefix deprecation on
.Nm rtadvd
shutdown.
.Bl -tag -width indent
.It Cm \&nodeprecate
(bool) By default
.Pc ,
.Xr rtadvd 8
will deprecate prefixes on shutdown. If this capability exists,
.Xr rtadvd 8
will not deprecate addresses on shutdown.
.El
.Pp
You can also refer one line from another by using
.Cm tc
capability.

Lines 189-194 struct rainfo { Link Here

(-)b/usr.sbin/rtadvd/rtadvd.h (+1 lines)
189		189
190	int rai_advlinkopt; /* bool: whether include link-layer addr opt */	190	int rai_advlinkopt; /* bool: whether include link-layer addr opt */
191	int rai_advifprefix; /* bool: gather IF prefixes? */	191	int rai_advifprefix; /* bool: gather IF prefixes? */
		192	int rai_deprecate; /* bool: deprecate on shutdown */
192		193
193	/* Router configuration variables */	194	/* Router configuration variables */
194	uint16_t rai_lifetime; /* AdvDefaultLifetime */	195	uint16_t rai_lifetime; /* AdvDefaultLifetime */

Return to bug 265761

Lines 430-435 DNS search list entries. Link Here

(-)b/usr.sbin/rtadvd/rtadvd.conf.5 (+13 lines)
430	The default value is 3/2 of the interval time.	430	The default value is 3/2 of the interval time.
431	.El	431	.El
432	.Pp	432	.Pp
		433	The following item controls prefix deprecation on
		434	.Nm rtadvd
		435	shutdown.
		436	.Bl -tag -width indent
		437	.It Cm \&nodeprecate
		438	(bool) By default
		439	.Pc ,
		440	.Xr rtadvd 8
		441	will deprecate prefixes on shutdown. If this capability exists,
		442	.Xr rtadvd 8
		443	will not deprecate addresses on shutdown.
		444	.El
		445	.Pp
433	You can also refer one line from another by using	446	You can also refer one line from another by using
434	.Cm tc	447	.Cm tc
435	capability.	448	capability.