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

ipv6 prefix delegation fix logging

Browse source
This commit is contained in:
Wen Liang 2024-02-28 11:38:04 -05:00
parent d5c12a137b
commit 89ff1c0d71
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15971,7 +15971,7 @@ nm_device_add_pending_action(NMDevice *self, const char *action, gboolean assert
gssize idx; gssize idx;
g_return_val_if_fail(action, FALSE); g_return_val_if_fail(action, FALSE);
_LOGW(LOGD_DEVICE, "---- %s:%d : connection on device %p", __func__, __LINE__, nm_device_get_applied_connection(self));
idx = nm_strv_find_binary_search(priv->pending_actions.arr, priv->pending_actions.len, action); idx = nm_strv_find_binary_search(priv->pending_actions.arr, priv->pending_actions.len, action);
if (idx >= 0) { if (idx >= 0) {
if (assert_not_yet_pending) { if (assert_not_yet_pending) {

2
src/core/nm-policy.c
View file

@ -154,6 +154,7 @@ _clear_ip6_subnet(gpointer key, gpointer value, gpointer user_data)
NMPlatformIP6Address *subnet = value; NMPlatformIP6Address *subnet = value;
NMDevice *device = nm_manager_get_device_by_ifindex(NM_MANAGER_GET, GPOINTER_TO_INT(key)); NMDevice *device = nm_manager_get_device_by_ifindex(NM_MANAGER_GET, GPOINTER_TO_INT(key));
_LOGW(LOGD_DEVICE, "---- %s:%d : connection on device %p", __func__, __LINE__, nm_device_get_applied_connection(device));
if (device) { if (device) {
/* We can not remove a subnet we already started announcing. /* We can not remove a subnet we already started announcing.
* Just un-prefer it. */ * Just un-prefer it. */
@ -168,7 +169,6 @@ clear_ip6_prefix_delegation(gpointer data)
{ {
IP6PrefixDelegation *delegation = data; IP6PrefixDelegation *delegation = data;
char sbuf[NM_INET_ADDRSTRLEN]; char sbuf[NM_INET_ADDRSTRLEN];
_LOGD(LOGD_IP6, _LOGD(LOGD_IP6,
"ipv6-pd: undelegating prefix %s/%d", "ipv6-pd: undelegating prefix %s/%d",
nm_inet6_ntop(&delegation->prefix.address, sbuf), nm_inet6_ntop(&delegation->prefix.address, sbuf),