RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #8480 from miri64/gnrc_ipv6_nib/fix/fix-conv

Browse Source 
gnrc_ipv6_nib: ignore corner case when adding to PL
This commit is contained in:
Martine Lenders 2018-01-30 13:52:15 +01:00 committed by GitHub
commit f1f079fb0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.c
View File

@ -764,12 +764,17 @@ _nib_offl_entry_t *_nib_pl_add(unsigned iface,
if (pref_ltime != UINT32_MAX) {
_evtimer_add(dst, GNRC_IPV6_NIB_PFX_TIMEOUT, &dst->pfx_timeout,
pref_ltime);
if (((pref_ltime + now) == UINT32_MAX) && (now != 0)) {
pref_ltime++;
/* ignore capped of preferred lifetimes from sec to ms conversion */
if (pref_ltime < (UINT32_MAX - 1)) {
/* prevent pref_ltime from becoming UINT32_MAX */
if (((pref_ltime + now) == UINT32_MAX) && (now != 0)) {
pref_ltime++;
}
pref_ltime += now;
}
pref_ltime += now;
}
if (valid_ltime != UINT32_MAX) {
/* ignore capped of valid lifetimes from sec to ms conversion */
if (valid_ltime < (UINT32_MAX - 1)) {
/* prevent valid_ltime from becoming UINT32_MAX */
if ((valid_ltime + now) == UINT32_MAX) {
valid_ltime++;

4
tests/gnrc_ipv6_nib/main.c
View File

@ -1114,8 +1114,8 @@ static void test_handle_pkt__rtr_adv__success(uint8_t rtr_adv_flags,
"Unexpected prefix configured");
TEST_ASSERT_EQUAL_INT(_LOC_GB_PFX_LEN, prefix.pfx_len);
TEST_ASSERT_EQUAL_INT(_mock_netif->pid, prefix.iface);
TEST_ASSERT(_PIO_PFX_LTIME < prefix.valid_until);
TEST_ASSERT(_PIO_PFX_LTIME < prefix.pref_until);
TEST_ASSERT((_PIO_PFX_LTIME / MS_PER_SEC) < prefix.valid_until);
TEST_ASSERT((_PIO_PFX_LTIME / MS_PER_SEC) < prefix.pref_until);
}
}
if (!pio || !(pio_flags & NDP_OPT_PI_FLAGS_L)) {

4
tests/gnrc_ipv6_nib_6ln/main.c
View File

@ -1072,8 +1072,8 @@ static void test_handle_pkt__rtr_adv__success(uint8_t rtr_adv_flags,
"Unexpected prefix configured");
TEST_ASSERT_EQUAL_INT(_LOC_GB_PFX_LEN, prefix.pfx_len);
TEST_ASSERT_EQUAL_INT(_mock_netif->pid, prefix.iface);
TEST_ASSERT(_PIO_PFX_LTIME < prefix.valid_until);
TEST_ASSERT(_PIO_PFX_LTIME < prefix.pref_until);
TEST_ASSERT((_PIO_PFX_LTIME / MS_PER_SEC) < prefix.valid_until);
TEST_ASSERT((_PIO_PFX_LTIME / MS_PER_SEC) < prefix.pref_until);
}
}
if (!pio) {