system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 20:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

platform: add the a_no_auto_noprefixroute flag

Browse source 
`nm_platform_ip_address_sync()` likes to add IFA_F_NOPREFIXROUTE flag
for all addresses, regardless of `a_ifi_flags` property. By setting this
boolean, that automatism can be suppressed, and the noprefixroute flag
does not get added automatically.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1307
This commit is contained in:
Wen Liang 2022-07-20 10:41:02 -04:00
parent f00e747beb
commit bd84ae4dc5
2 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/libnm-platform/nm-platform.c
View file

@ -4506,18 +4506,20 @@ next_plat:;
nm_platform_ip4_broadcast_address_from_addr(&known_address->a4),
lifetime,
preferred,
IFA_F_NOPREFIXROUTE,
known_address->ax.a_no_auto_noprefixroute ? 0 : IFA_F_NOPREFIXROUTE,
known_address->a4.label))
success = FALSE;
} else {
if (!nm_platform_ip6_address_add(self,
ifindex,
known_address->a6.address,
known_address->a6.plen,
known_address->a6.peer_address,
lifetime,
preferred,
IFA_F_NOPREFIXROUTE | known_address->a6.n_ifa_flags))
if (!nm_platform_ip6_address_add(
self,
ifindex,
known_address->a6.address,
known_address->a6.plen,
known_address->a6.peer_address,
lifetime,
preferred,
(known_address->ax.a_no_auto_noprefixroute ? 0 : IFA_F_NOPREFIXROUTE)
| known_address->a6.n_ifa_flags))
success = FALSE;
}
}
@ -6654,6 +6656,7 @@ nm_platform_ip4_address_to_string(const NMPlatformIP4Address *address, char *buf
" src %s"
"%s" /* a_acd_not_ready */
"%s" /* a_force_commit */
"%s" /* a_no_auto_noprefixroute */
"",
s_address,
address->plen,
@ -6672,7 +6675,8 @@ nm_platform_ip4_address_to_string(const NMPlatformIP4Address *address, char *buf
str_label,
nmp_utils_ip_config_source_to_string(address->addr_source, s_source, sizeof(s_source)),
address->a_acd_not_ready ? " ip4acd-not-ready" : "",
address->a_force_commit ? " force-commit" : "");
address->a_force_commit ? " force-commit" : "",
address->a_no_auto_noprefixroute ? " no-auto-noprefixroute" : "");
g_free(str_peer);
return buf;
}
@ -6793,6 +6797,7 @@ nm_platform_ip6_address_to_string(const NMPlatformIP6Address *address, char *buf
len,
"%s/%d lft %s pref %s%s%s%s%s src %s"
"%s" /* a_force_commit */
"%s" /* a_no_auto_noprefixroute */
"",
s_address,
address->plen,
@ -6803,7 +6808,8 @@ nm_platform_ip6_address_to_string(const NMPlatformIP6Address *address, char *buf
str_dev,
_to_string_ifa_flags(address->n_ifa_flags, s_flags, sizeof(s_flags)),
nmp_utils_ip_config_source_to_string(address->addr_source, s_source, sizeof(s_source)),
address->a_force_commit ? " force-commit" : "");
address->a_force_commit ? " force-commit" : "",
address->a_no_auto_noprefixroute ? " no-auto-noprefixroute" : "");
g_free(str_peer);
return buf;
}
@ -8363,7 +8369,8 @@ nm_platform_ip4_address_hash_update(const NMPlatformIP4Address *obj, NMHashState
NM_HASH_COMBINE_BOOLS(guint8,
obj->use_ip4_broadcast_address,
obj->a_acd_not_ready,
obj->a_force_commit));
obj->a_force_commit,
obj->a_no_auto_noprefixroute));
nm_hash_update_strarr(h, obj->label);
}
@ -8412,6 +8419,7 @@ nm_platform_ip4_address_cmp(const NMPlatformIP4Address *a,
NM_CMP_FIELD(a, b, broadcast_address);
NM_CMP_FIELD_UNSAFE(a, b, a_acd_not_ready);
NM_CMP_FIELD_UNSAFE(a, b, a_force_commit);
NM_CMP_FIELD_UNSAFE(a, b, a_no_auto_noprefixroute);
}
return 0;
}
@ -8421,17 +8429,18 @@ nm_platform_ip4_address_cmp(const NMPlatformIP4Address *a,
void
nm_platform_ip6_address_hash_update(const NMPlatformIP6Address *obj, NMHashState *h)
{
nm_hash_update_vals(h,
obj->ifindex,
obj->addr_source,
obj->timestamp,
obj->lifetime,
obj->preferred,
obj->n_ifa_flags,
obj->plen,
obj->address,
obj->peer_address,
NM_HASH_COMBINE_BOOLS(guint8, obj->a_force_commit));
nm_hash_update_vals(
h,
obj->ifindex,
obj->addr_source,
obj->timestamp,
obj->lifetime,
obj->preferred,
obj->n_ifa_flags,
obj->plen,
obj->address,
obj->peer_address,
NM_HASH_COMBINE_BOOLS(guint8, obj->a_force_commit, obj->a_no_auto_noprefixroute));
}
int
@ -8475,6 +8484,7 @@ nm_platform_ip6_address_cmp(const NMPlatformIP6Address *a,
NM_CMP_FIELD(a, b, n_ifa_flags);
NM_CMP_FIELD(a, b, addr_source);
NM_CMP_FIELD_UNSAFE(a, b, a_force_commit);
NM_CMP_FIELD_UNSAFE(a, b, a_no_auto_noprefixroute);
}
return 0;
}

6
src/libnm-platform/nm-platform.h
View file

@ -339,6 +339,12 @@ typedef enum {
* should be configured. */ \
bool a_force_commit : 1; \
\
/* nm_platform_ip_address_sync() likes to add IFA_F_NOPREFIXROUTE flag for all
* addresses, regardless of a_ifi_flags property. By setting this boolean, that
* automatism can be suppressed, and the noprefixroute flag does not get added
* automatically. */ \
bool a_no_auto_noprefixroute : 1; \
\
/* Don't have a bitfield as last field in __NMPlatformIPAddress_COMMON. It would then
* be unclear how the following fields get merged. We could also use a zero bitfield,
* but instead we just have there the uint8 field. */ \