fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 08:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'jv/ipv6-acd-logging'

Browse source 
device: add IPv6 ACD logging for ac6/manual configuration

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1787
This commit is contained in:
Beniamino Galvani 2023-11-14 07:57:40 +00:00
commit 8d2e510065
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/core/devices/nm-device.c
View file

@ -4427,6 +4427,19 @@ update_external_connection(NMDevice *self)
}
}
static void
_dev_ipv6_log_conflicts(NMDevice *self, GArray *conflicts)
{
guint i;
char sbuf[NM_INET_ADDRSTRLEN];
for (i = 0; i < conflicts->len; i++) {
const struct in6_addr *addr = &nm_g_array_index(conflicts, const struct in6_addr, i);
_LOGI(LOGD_DEVICE, "Conflict detected for IPv6 address: %s", nm_inet6_ntop(addr, sbuf));
}
}
static void
_dev_l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDevice *self)
{
@ -4521,6 +4534,10 @@ _dev_l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, N
NM_L3CFG_CHECK_READY_FLAGS_IP6_DAD_READY,
&conflicts);
if (conflicts) {
if (_NMLOG_ENABLED(LOGL_INFO, LOGD_DEVICE)) {
_dev_ipv6_log_conflicts(self, conflicts);
}
/* nm_ndisc_dad_failed() will emit a new "NDisc:config-received"
* signal; _dev_ipac6_ndisc_config_changed() will be called
* synchronously to update the current state and schedule a commit. */
@ -10645,6 +10662,11 @@ _dev_ipmanual_check_ready(NMDevice *self)
addr_family,
flags,
&conflicts);
if (_NMLOG_ENABLED(LOGL_INFO, LOGD_DEVICE) && conflicts && !IS_IPv4) {
_dev_ipv6_log_conflicts(self, conflicts);
}
if (ready) {
guint num_addrs = 0;
@ -11989,8 +12011,9 @@ _dev_ipac6_ndisc_config_changed(NMNDisc *ndisc,
const NML3ConfigData *l3cd,
NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
gboolean ready;
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
gboolean ready;
gs_unref_array GArray *conflicts = NULL;
/* The ndisc configuration changes when we receive a new RA or
* when a lifetime expires; but also when DAD fails for a
@ -12007,7 +12030,12 @@ _dev_ipac6_ndisc_config_changed(NMNDisc *ndisc,
l3cd,
AF_INET6,
NM_L3CFG_CHECK_READY_FLAGS_IP6_DAD_READY,
NULL);
&conflicts);
if (_NMLOG_ENABLED(LOGL_INFO, LOGD_DEVICE) && conflicts) {
_dev_ipv6_log_conflicts(self, conflicts);
}
if (ready) {
_dev_ipac6_set_state(self, NM_DEVICE_IP_STATE_READY);
} else {

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

@ -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;