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

network/address: split-out address_match_null()

Browse Source 
No functional change, preparation for later commits.
This commit is contained in:
Yu Watanabe
2023-07-29 22:48:49 +09:00
parent a3a25d01ce
commit a2532c9db8
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-address.c
+22 -11
View File
@@ -587,6 +587,27 @@ static int address_drop(Address *address) {
return 0;
}
static bool address_match_null(const Address *a, const Address *null_address) {
assert(a);
assert(null_address);
if (!a->requested_as_null)
return false;
/* Currently, null address is supported only by static addresses. Note that static
* address may be set as foreign during reconfiguring the interface. */
if (!IN_SET(a->source, NETWORK_CONFIG_SOURCE_FOREIGN, NETWORK_CONFIG_SOURCE_STATIC))
return false;
if (a->family != null_address->family)
return false;
if (a->prefixlen != null_address->prefixlen)
return false;
return true;
}
int address_get(Link *link, const Address *in, Address **ret) {
Address *a;
@@ -603,17 +624,7 @@ int address_get(Link *link, const Address *in, Address **ret) {
/* Find matching address that originally requested as null address. */
if (address_is_static_null(in))
SET_FOREACH(a, link->addresses) {
if (!a->requested_as_null)
continue;
/* Currently, null address is supported only by static addresses. Note that static
* address may be set as foreign during reconfiguring the interface. */
if (!IN_SET(a->source, NETWORK_CONFIG_SOURCE_FOREIGN, NETWORK_CONFIG_SOURCE_STATIC))
continue;
if (a->family != in->family)
continue;
if (a->prefixlen != in->prefixlen)
if (!address_match_null(a, in))
continue;
if (ret)