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

network: use the overall online state in network_is_online()

Browse Source 
Since networkd advertises a reliable online state, use it in
network_is_online(). If for some reason networkd does not know the
online state (e.g. it does not manage any of the network interfaces),
fall back to the original best-guess logic.
This commit is contained in:
Alvin Šipraga
2021-05-19 10:34:06 +09:00
committed by Yu Watanabe
parent bcdcc59648
commit 84a257ab65
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-network/network-util.c
+23 -9
View File
@@ -13,20 +13,34 @@
#include "strv.h"
bool network_is_online(void) {
_cleanup_free_ char *carrier_state = NULL, *addr_state = NULL;
_cleanup_free_ char *online_state = NULL;
LinkOnlineState state;
int r;
r = sd_network_get_carrier_state(&carrier_state);
if (r < 0) /* if we don't know anything, we consider the system online */
return true;
r = sd_network_get_online_state(&online_state);
if (r < 0)
state = _LINK_ONLINE_STATE_INVALID;
else
state = link_online_state_from_string(online_state);
r = sd_network_get_address_state(&addr_state);
if (r < 0) /* if we don't know anything, we consider the system online */
if (state >= LINK_ONLINE_STATE_PARTIAL)
return true;
else if (state < 0) {
_cleanup_free_ char *carrier_state = NULL, *addr_state = NULL;
if (STR_IN_SET(carrier_state, "degraded-carrier", "carrier") &&
STR_IN_SET(addr_state, "routable", "degraded"))
return true;
r = sd_network_get_carrier_state(&carrier_state);
if (r < 0) /* if we don't know anything, we consider the system online */
return true;
r = sd_network_get_address_state(&addr_state);
if (r < 0) /* if we don't know anything, we consider the system online */
return true;
/* we don't know the online state for certain, so make an educated guess */
if (STR_IN_SET(carrier_state, "degraded-carrier", "carrier") &&
STR_IN_SET(addr_state, "routable", "degraded"))
return true;
}
return false;
}