fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 01:47:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndisc: accept multiple addresses in nm_ndisc_dad_failed()

Browse source 
Since we evaluate platform changes in a idle handler, there can be
multiple DAD failure at the same time that must generate a single
ndisc.configuration-change signal.

The function is unused at the moment.
This commit is contained in:
Beniamino Galvani 2022-09-06 17:09:37 +02:00
parent afa208c862
commit 5da8e0666b
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/core/ndisc/nm-ndisc.c
View file

@ -1221,28 +1221,35 @@ nm_ndisc_stop(NMNDisc *ndisc)
}
NMNDiscConfigMap
nm_ndisc_dad_failed(NMNDisc *ndisc, const struct in6_addr *address, gboolean emit_changed_signal)
nm_ndisc_dad_failed(NMNDisc *ndisc, GArray *addresses, gboolean emit_changed_signal)
{
NMNDiscDataInternal *rdata;
guint i;
guint j;
gboolean changed = FALSE;
g_return_val_if_fail(addresses, NM_NDISC_CONFIG_NONE);
rdata = &NM_NDISC_GET_PRIVATE(ndisc)->rdata;
for (i = 0; i < rdata->addresses->len;) {
NMNDiscAddress *item = &nm_g_array_index(rdata->addresses, NMNDiscAddress, i);
for (i = 0; i < addresses->len; i++) {
const struct in6_addr *addr = &nm_g_array_index(addresses, struct in6_addr, i);
if (IN6_ARE_ADDR_EQUAL(&item->address, address)) {
char sbuf[NM_INET_ADDRSTRLEN];
for (j = 0; j < rdata->addresses->len;) {
NMNDiscAddress *item = &nm_g_array_index(rdata->addresses, NMNDiscAddress, j);
_LOGD("DAD failed for discovered address %s", nm_inet6_ntop(address, sbuf));
changed = TRUE;
if (!complete_address(ndisc, item)) {
g_array_remove_index(rdata->addresses, i);
continue;
if (IN6_ARE_ADDR_EQUAL(&item->address, addr)) {
char sbuf[NM_INET_ADDRSTRLEN];
_LOGD("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;
}
}
j++;
}
i++;
}
if (emit_changed_signal && changed)

4
src/core/ndisc/nm-ndisc.h
View file

@ -228,9 +228,9 @@ NMNDiscNodeType nm_ndisc_get_node_type(NMNDisc *self);
gboolean nm_ndisc_set_iid(NMNDisc *ndisc, const NMUtilsIPv6IfaceId iid, gboolean is_token);
void nm_ndisc_start(NMNDisc *ndisc);
void nm_ndisc_stop(NMNDisc *ndisc);
void nm_ndisc_set_config(NMNDisc *ndisc, const NML3ConfigData *l3cd);
NMNDiscConfigMap
nm_ndisc_dad_failed(NMNDisc *ndisc, const struct in6_addr *address, gboolean emit_changed_signal);
void nm_ndisc_set_config(NMNDisc *ndisc, const NML3ConfigData *l3cd);
nm_ndisc_dad_failed(NMNDisc *ndisc, GArray *addresses, gboolean emit_changed_signal);
NMPlatform *nm_ndisc_get_platform(NMNDisc *self);
NMPNetns *nm_ndisc_netns_get(NMNDisc *self);