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

Merge pull request #25568 from yuwata/network-tiny-cleanups

Browse Source 
network: tiny cleanups
This commit is contained in:
Luca Boccassi
2022-12-01 23:12:26 +01:00
committed by GitHub
parent 4f0fafb6f0 4bbe559b5c
commit f7031144da
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-address.c
+7 -22
View File
@@ -462,14 +462,9 @@ static int address_add(Link *link, Address *address) {
}
static int address_update(Address *address) {
Link *link;
Link *link = ASSERT_PTR(ASSERT_PTR(address)->link);
int r;
assert(address);
assert(address->link);
link = address->link;
if (address_is_ready(address) &&
address->family == AF_INET6 &&
in6_addr_is_link_local(&address->in_addr.in6) &&
@@ -485,7 +480,7 @@ static int address_update(Address *address) {
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return 0;
r = address_set_masquerade(address, true);
r = address_set_masquerade(address, /* add = */ true);
if (r < 0)
return log_link_warning_errno(link, r, "Could not enable IP masquerading: %m");
@@ -497,23 +492,16 @@ static int address_update(Address *address) {
return r;
}
link_update_operstate(link, true);
link_update_operstate(link, /* also_update_master = */ true);
link_check_ready(link);
return 0;
}
static int address_drop(Address *address) {
Link *link;
bool ready;
Link *link = ASSERT_PTR(ASSERT_PTR(address)->link);
int r;
assert(address);
assert(address->link);
ready = address_is_ready(address);
link = address->link;
r = address_set_masquerade(address, false);
r = address_set_masquerade(address, /* add = */ false);
if (r < 0)
log_link_warning_errno(link, r, "Failed to disable IP masquerading, ignoring: %m");
@@ -522,11 +510,8 @@ static int address_drop(Address *address) {
if (address->state == 0)
address_free(address);
link_update_operstate(link, true);
if (link && !ready)
link_check_ready(link);
link_update_operstate(link, /* also_update_master = */ true);
link_check_ready(link);
return 0;
}
src/network/networkd-util.h
+1
View File
@@ -91,6 +91,7 @@ int network_config_state_to_string_alloc(NetworkConfigState s, char **ret);
0); \
} \
static inline bool name##_is_requesting(type *t) { \
assert(t); \
return FLAGS_SET(t->state, NETWORK_CONFIG_STATE_REQUESTING); \
} \
static inline void name##_enter_configuring(type *t) { \