SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network/address: drop requirement of Address.link and .network in address_can_update()

Browse Source 
This also rename arguments.
No functional change, just refactoring.
This commit is contained in:
Yu Watanabe
2024-02-14 13:59:04 +09:00
parent e1390da025
commit a45e1c35e3
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-address.c
+15 -17
View File
@@ -516,11 +516,9 @@ static int address_compare_func(const Address *a1, const Address *a2) {
}
}
static bool address_can_update(const Address *la, const Address *na) {
assert(la);
assert(la->link);
assert(na);
assert(na->network);
static bool address_can_update(const Address *existing, const Address *requesting) {
assert(existing);
assert(requesting);
/*
* property | IPv4 | IPv6
@@ -545,32 +543,32 @@ static bool address_can_update(const Address *la, const Address *na) {
* IPv6 : See inet6_addr_modify() in net/ipv6/addrconf.c.
*/
if (la->family != na->family)
if (existing->family != requesting->family)
return false;
if (la->prefixlen != na->prefixlen)
if (existing->prefixlen != requesting->prefixlen)
return false;
/* When a null address is requested, the address to be assigned/updated will be determined later. */
if (!address_is_static_null(na) &&
in_addr_equal(la->family, &la->in_addr, &na->in_addr) <= 0)
if (!address_is_static_null(requesting) &&
in_addr_equal(existing->family, &existing->in_addr, &requesting->in_addr) <= 0)
return false;
switch (la->family) {
switch (existing->family) {
case AF_INET: {
struct in_addr bcast;
if (la->scope != na->scope)
if (existing->scope != requesting->scope)
return false;
if (((la->flags ^ na->flags) & KNOWN_FLAGS & ~IPV6ONLY_FLAGS & ~UNMANAGED_FLAGS) != 0)
if (((existing->flags ^ requesting->flags) & KNOWN_FLAGS & ~IPV6ONLY_FLAGS & ~UNMANAGED_FLAGS) != 0)
return false;
if (!streq_ptr(la->label, na->label))
if (!streq_ptr(existing->label, requesting->label))
return false;
if (!in4_addr_equal(&la->in_addr_peer.in, &na->in_addr_peer.in))
if (!in4_addr_equal(&existing->in_addr_peer.in, &requesting->in_addr_peer.in))
return false;
if (address_get_broadcast(na, la->link, &bcast) >= 0) {
if (existing->link && address_get_broadcast(requesting, existing->link, &bcast) >= 0) {
/* If the broadcast address can be determined now, check if they match. */
if (!in4_addr_equal(&la->broadcast, &bcast))
if (!in4_addr_equal(&existing->broadcast, &bcast))
return false;
} else {
/* When a null address is requested, then the broadcast address will be
@@ -578,7 +576,7 @@ static bool address_can_update(const Address *la, const Address *na) {
* 192.168.0.10/24 -> 192.168.0.255
* So, here let's only check if the broadcast is the last address in the range, e.g.
* 0.0.0.0/24 -> 0.0.0.255 */
if (!FLAGS_SET(la->broadcast.s_addr, htobe32(UINT32_C(0xffffffff) >> la->prefixlen)))
if (!FLAGS_SET(existing->broadcast.s_addr, htobe32(UINT32_C(0xffffffff) >> existing->prefixlen)))
return false;
}
break;