d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made sure to keep the current stored lifetime when it was not updated

Browse Source 
by an RA.
(a detailed description of this issue is found at the following URL.)
http://www.tahi.org/report/freebsd/freebsd48-rc2-20030316/host/lcna-stateless-addrconf/38.html

Reported by:	Ozoe Nobumichi <ozoe@tahi.org>
		through a periodic TAHI test
Submitted by:	JINMEI Tatuya <jinmei@isl.rdc.toshiba.co.jp>
Obtained from:	KAME
This commit is contained in:
Hajimu UMEMOTO 2003-03-26 17:37:35 +00:00
parent e40f1e0cb6
commit 11f3a6e295
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=112678
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netinet6/nd6_rtr.c
View File

@ -1085,8 +1085,15 @@ prelist_update(new, dr, m)
#define TWOHOUR (120*60)
lt6_tmp = ifa6->ia6_lifetime;
storedlifetime = IFA6_IS_INVALID(ifa6) ? 0 :
(lt6_tmp.ia6t_expire - time_second);
if (lt6_tmp.ia6t_vltime == ND6_INFINITE_LIFETIME)
storedlifetime = ND6_INFINITE_LIFETIME;
else if (IFA6_IS_INVALID(ifa6))
storedlifetime = 0;
else
storedlifetime = lt6_tmp.ia6t_expire - time_second;
/* when not updating, keep the current stored lifetime. */
lt6_tmp.ia6t_vltime = storedlifetime;
if (TWOHOUR < new->ndpr_vltime ||
storedlifetime < new->ndpr_vltime) {
@ -1857,7 +1864,6 @@ in6_init_prefix_ltimes(struct nd_prefix *ndpr)
static void
in6_init_address_ltimes(struct nd_prefix *new, struct in6_addrlifetime *lt6)
{
/* Valid lifetime must not be updated unless explicitly specified. */
/* init ia6t_expire */
if (lt6->ia6t_vltime == ND6_INFINITE_LIFETIME)
lt6->ia6t_expire = 0;