Skip to content

Commit 46f807c

Browse files
committed
in6: modify address prefix lifetimes when updating address lifetimes
Taken from: https://reviews.freebsd.org/D54561 https://reviews.freebsd.org/D54562
1 parent 7c00cbb commit 46f807c

File tree

3 files changed

+44
-41
lines changed

3 files changed

+44
-41
lines changed

sys/netinet6/in6.c

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,15 @@ in6_alloc_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra, int flags)
10341034
return (ia);
10351035
}
10361036

1037+
time_t
1038+
in6_expire_time(uint32_t ltime)
1039+
{
1040+
if (ltime == ND6_INFINITE_LIFETIME)
1041+
return (0);
1042+
else
1043+
return (time_uptime + ltime);
1044+
}
1045+
10371046
/*
10381047
* Update/configure interface address parameters:
10391048
*
@@ -1056,16 +1065,10 @@ in6_update_ifa_internal(struct ifnet *ifp, struct in6_aliasreq *ifra,
10561065
* these members for applications.
10571066
*/
10581067
ia->ia6_lifetime = ifra->ifra_lifetime;
1059-
if (ia->ia6_lifetime.ia6t_vltime != ND6_INFINITE_LIFETIME) {
1060-
ia->ia6_lifetime.ia6t_expire =
1061-
time_uptime + ia->ia6_lifetime.ia6t_vltime;
1062-
} else
1063-
ia->ia6_lifetime.ia6t_expire = 0;
1064-
if (ia->ia6_lifetime.ia6t_pltime != ND6_INFINITE_LIFETIME) {
1065-
ia->ia6_lifetime.ia6t_preferred =
1066-
time_uptime + ia->ia6_lifetime.ia6t_pltime;
1067-
} else
1068-
ia->ia6_lifetime.ia6t_preferred = 0;
1068+
ia->ia6_lifetime.ia6t_expire =
1069+
in6_expire_time(ifra->ifra_lifetime.ia6t_vltime);
1070+
ia->ia6_lifetime.ia6t_preferred =
1071+
in6_expire_time(ifra->ifra_lifetime.ia6t_pltime);
10691072

10701073
/*
10711074
* backward compatibility - if IN6_IFF_DEPRECATED is set from the
@@ -1323,6 +1326,28 @@ in6_addifaddr(struct ifnet *ifp, struct in6_aliasreq *ifra, struct in6_ifaddr *i
13231326
(*carp_detach_p)(&ia->ia_ifa, false);
13241327
goto out;
13251328
}
1329+
} else if (pr->ndpr_raf_onlink) {
1330+
time_t expiry;
1331+
1332+
/*
1333+
* If the prefix already exists, update lifetimes, but avoid
1334+
* shortening them.
1335+
*/
1336+
ND6_WLOCK();
1337+
expiry = in6_expire_time(pr0.ndpr_pltime);
1338+
if (pr->ndpr_preferred != 0 &&
1339+
(pr->ndpr_preferred < expiry || expiry == 0)) {
1340+
pr->ndpr_pltime = pr0.ndpr_pltime;
1341+
pr->ndpr_preferred = expiry;
1342+
}
1343+
expiry = in6_expire_time(pr0.ndpr_vltime);
1344+
if (pr->ndpr_expire != 0 &&
1345+
(pr->ndpr_expire < expiry || expiry == 0)) {
1346+
pr->ndpr_vltime = pr0.ndpr_vltime;
1347+
pr->ndpr_expire = expiry;
1348+
}
1349+
pr->ndpr_lastupdate = time_uptime;
1350+
ND6_WUNLOCK();
13261351
}
13271352

13281353
/* relate the address to the prefix */

sys/netinet6/in6.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,8 @@ int in6_cksum_partial_l2(struct mbuf *m, uint8_t nxt, uint32_t off_l3,
671671
uint32_t off_l4, uint32_t len, uint32_t cov);
672672
int in6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t);
673673

674+
time_t in6_expire_time(uint32_t);
675+
674676
int in6_localaddr(struct in6_addr *);
675677
int in6_localip(struct in6_addr *);
676678
bool in6_localip_fib(struct in6_addr *, uint16_t);

sys/netinet6/nd6_rtr.c

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,39 +1139,18 @@ defrtrlist_update(struct nd_defrouter *new)
11391139
return (n);
11401140
}
11411141

1142-
static int
1142+
static void
11431143
in6_init_prefix_ltimes(struct nd_prefix *ndpr)
11441144
{
1145-
if (ndpr->ndpr_pltime == ND6_INFINITE_LIFETIME)
1146-
ndpr->ndpr_preferred = 0;
1147-
else
1148-
ndpr->ndpr_preferred = time_uptime + ndpr->ndpr_pltime;
1149-
if (ndpr->ndpr_vltime == ND6_INFINITE_LIFETIME)
1150-
ndpr->ndpr_expire = 0;
1151-
else
1152-
ndpr->ndpr_expire = time_uptime + ndpr->ndpr_vltime;
1153-
1154-
return 0;
1145+
ndpr->ndpr_preferred = in6_expire_time(ndpr->ndpr_pltime);
1146+
ndpr->ndpr_expire = in6_expire_time(ndpr->ndpr_vltime);
11551147
}
11561148

11571149
static void
11581150
in6_init_address_ltimes(struct nd_prefix *new, struct in6_addrlifetime *lt6)
11591151
{
1160-
/* init ia6t_expire */
1161-
if (lt6->ia6t_vltime == ND6_INFINITE_LIFETIME)
1162-
lt6->ia6t_expire = 0;
1163-
else {
1164-
lt6->ia6t_expire = time_uptime;
1165-
lt6->ia6t_expire += lt6->ia6t_vltime;
1166-
}
1167-
1168-
/* init ia6t_preferred */
1169-
if (lt6->ia6t_pltime == ND6_INFINITE_LIFETIME)
1170-
lt6->ia6t_preferred = 0;
1171-
else {
1172-
lt6->ia6t_preferred = time_uptime;
1173-
lt6->ia6t_preferred += lt6->ia6t_pltime;
1174-
}
1152+
lt6->ia6t_preferred = in6_expire_time(lt6->ia6t_pltime);
1153+
lt6->ia6t_expire = in6_expire_time(lt6->ia6t_vltime);
11751154
}
11761155

11771156
static struct in6_ifaddr *
@@ -1355,11 +1334,8 @@ nd6_prelist_add(struct nd_prefixctl *pr, struct nd_defrouter *dr,
13551334
new->ndpr_vltime = pr->ndpr_vltime;
13561335
new->ndpr_pltime = pr->ndpr_pltime;
13571336
new->ndpr_flags = pr->ndpr_flags;
1358-
if ((error = in6_init_prefix_ltimes(new)) != 0) {
1359-
free(new, M_IP6NDP);
1360-
return (error);
1361-
}
13621337
new->ndpr_lastupdate = time_uptime;
1338+
in6_init_prefix_ltimes(new);
13631339

13641340
/* initialization */
13651341
LIST_INIT(&new->ndpr_advrtrs);
@@ -1502,7 +1478,7 @@ prelist_update(struct nd_prefixctl *new, struct nd_defrouter *dr,
15021478
if (new->ndpr_raf_onlink) {
15031479
pr->ndpr_vltime = new->ndpr_vltime;
15041480
pr->ndpr_pltime = new->ndpr_pltime;
1505-
(void)in6_init_prefix_ltimes(pr); /* XXX error case? */
1481+
in6_init_prefix_ltimes(pr);
15061482
pr->ndpr_lastupdate = time_uptime;
15071483
}
15081484

0 commit comments

Comments
 (0)