diff options
| author | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:18 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:18 +0100 |
| commit | 70e18d99b8e3e77bb37e218d7ac582130156f8ef (patch) | |
| tree | d40c587e6d3f0e094ff558e415f1bb9803643214 /src/core/ndisc | |
| parent | d4d8b2b91f7ba000d97a8b2aab48c85000c11314 (diff) | |
New upstream version 1.45.90 upstream/1.45.90
Diffstat (limited to 'src/core/ndisc')
| -rw-r--r-- | src/core/ndisc/nm-fake-ndisc.c | 2 | ||||
| -rw-r--r-- | src/core/ndisc/nm-lndp-ndisc.c | 2 | ||||
| -rw-r--r-- | src/core/ndisc/nm-ndisc.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/core/ndisc/nm-fake-ndisc.c b/src/core/ndisc/nm-fake-ndisc.c index f305e771..f0b6dcf6 100644 --- a/src/core/ndisc/nm-fake-ndisc.c +++ b/src/core/ndisc/nm-fake-ndisc.c @@ -239,7 +239,7 @@ receive_ra(gpointer user_data) priv->receive_ra_id = 0; /* preserve the "most managed" level on updates. */ - dhcp_level = MAX(rdata->public.dhcp_level, ra->dhcp_level); + dhcp_level = NM_MAX(rdata->public.dhcp_level, ra->dhcp_level); if (rdata->public.dhcp_level != dhcp_level) { rdata->public.dhcp_level = dhcp_level; diff --git a/src/core/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c index 63dde5a5..932366ff 100644 --- a/src/core/ndisc/nm-lndp-ndisc.c +++ b/src/core/ndisc/nm-lndp-ndisc.c @@ -161,7 +161,7 @@ receive_ra(struct ndp *ndp, struct ndp_msg *msg, gpointer user_data) * let's keep the "most managed" level. */ G_STATIC_ASSERT_EXPR(NM_NDISC_DHCP_LEVEL_MANAGED > NM_NDISC_DHCP_LEVEL_OTHERCONF); G_STATIC_ASSERT_EXPR(NM_NDISC_DHCP_LEVEL_OTHERCONF > NM_NDISC_DHCP_LEVEL_NONE); - dhcp_level = MAX(dhcp_level, rdata->public.dhcp_level); + dhcp_level = NM_MAX(dhcp_level, rdata->public.dhcp_level); if (dhcp_level != rdata->public.dhcp_level) { rdata->public.dhcp_level = dhcp_level; diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c index 20dd2121..c8f7ed0c 100644 --- a/src/core/ndisc/nm-ndisc.c +++ b/src/core/ndisc/nm-ndisc.c @@ -1293,10 +1293,8 @@ nm_ndisc_dad_failed(NMNDisc *ndisc, GArray *addresses, gboolean emit_changed_sig NMNDiscAddress *item = &nm_g_array_index(rdata->addresses, NMNDiscAddress, j); if (IN6_ARE_ADDR_EQUAL(&item->address, addr)) { - char sbuf[NM_INET_ADDRSTRLEN]; - - _LOGI("DAD failed for discovered address %s", nm_inet6_ntop(addr, sbuf)); changed = TRUE; + if (!complete_address(ndisc, item)) { g_array_remove_index(rdata->addresses, j); continue; |