sd-network: split the operstate 'unknown' into 'down' and 'up'
This commit is contained in:
parent
3c9b886068
commit
54cba0b16c
|
@ -1656,8 +1656,10 @@ static void link_update_operstate(Link *link) {
|
||||||
else
|
else
|
||||||
/* no useful addresses found */
|
/* no useful addresses found */
|
||||||
link->operstate = LINK_OPERSTATE_CARRIER;
|
link->operstate = LINK_OPERSTATE_CARRIER;
|
||||||
} else
|
} else if (link->flags & IFF_UP)
|
||||||
link->operstate = LINK_OPERSTATE_UNKNOWN;
|
link->operstate = LINK_OPERSTATE_UP;
|
||||||
|
else
|
||||||
|
link->operstate = LINK_OPERSTATE_DOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
int link_save(Link *link) {
|
int link_save(Link *link) {
|
||||||
|
@ -1791,7 +1793,8 @@ static const char* const link_state_table[_LINK_STATE_MAX] = {
|
||||||
DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState);
|
DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState);
|
||||||
|
|
||||||
static const char* const link_operstate_table[_LINK_OPERSTATE_MAX] = {
|
static const char* const link_operstate_table[_LINK_OPERSTATE_MAX] = {
|
||||||
[LINK_OPERSTATE_UNKNOWN] = "unknown",
|
[LINK_OPERSTATE_DOWN] = "down",
|
||||||
|
[LINK_OPERSTATE_UP] = "up",
|
||||||
[LINK_OPERSTATE_DORMANT] = "dormant",
|
[LINK_OPERSTATE_DORMANT] = "dormant",
|
||||||
[LINK_OPERSTATE_CARRIER] = "carrier",
|
[LINK_OPERSTATE_CARRIER] = "carrier",
|
||||||
[LINK_OPERSTATE_DEGRADED] = "degraded",
|
[LINK_OPERSTATE_DEGRADED] = "degraded",
|
||||||
|
|
|
@ -37,7 +37,8 @@ typedef enum LinkState {
|
||||||
} LinkState;
|
} LinkState;
|
||||||
|
|
||||||
typedef enum LinkOperationalState {
|
typedef enum LinkOperationalState {
|
||||||
LINK_OPERSTATE_UNKNOWN,
|
LINK_OPERSTATE_DOWN,
|
||||||
|
LINK_OPERSTATE_UP,
|
||||||
LINK_OPERSTATE_DORMANT,
|
LINK_OPERSTATE_DORMANT,
|
||||||
LINK_OPERSTATE_CARRIER,
|
LINK_OPERSTATE_CARRIER,
|
||||||
LINK_OPERSTATE_DEGRADED,
|
LINK_OPERSTATE_DEGRADED,
|
||||||
|
|
|
@ -456,7 +456,7 @@ int manager_save(Manager *m) {
|
||||||
Iterator i;
|
Iterator i;
|
||||||
_cleanup_free_ char *temp_path = NULL;
|
_cleanup_free_ char *temp_path = NULL;
|
||||||
_cleanup_fclose_ FILE *f = NULL;
|
_cleanup_fclose_ FILE *f = NULL;
|
||||||
LinkOperationalState operstate = LINK_OPERSTATE_UNKNOWN;
|
LinkOperationalState operstate = LINK_OPERSTATE_DOWN;
|
||||||
const char *operstate_str;
|
const char *operstate_str;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
_SD_BEGIN_DECLARATIONS;
|
_SD_BEGIN_DECLARATIONS;
|
||||||
|
|
||||||
/* Get overall operational state
|
/* Get overall operational state
|
||||||
* Possible states: unknown, dormant, carrier, degraded, routable
|
* Possible states: down, up, dormant, carrier, degraded, routable
|
||||||
* Possible return codes:
|
* Possible return codes:
|
||||||
* -ENODATA: networkd is not aware of any links
|
* -ENODATA: networkd is not aware of any links
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue