picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-network: split the operstate 'unknown' into 'down' and 'up'

This commit is contained in:
Tom Gundersen 2014-08-12 20:00:34 +02:00
parent 3c9b886068
commit 54cba0b16c
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/networkd-link.c
View File

@ -1656,8 +1656,10 @@ static void link_update_operstate(Link *link) {
else
/* no useful addresses found */
link->operstate = LINK_OPERSTATE_CARRIER;
} else
link->operstate = LINK_OPERSTATE_UNKNOWN;
} else if (link->flags & IFF_UP)
link->operstate = LINK_OPERSTATE_UP;
else
link->operstate = LINK_OPERSTATE_DOWN;
}
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);
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_CARRIER] = "carrier",
[LINK_OPERSTATE_DEGRADED] = "degraded",

3
src/network/networkd-link.h
View File

@ -37,7 +37,8 @@ typedef enum LinkState {
} LinkState;
typedef enum LinkOperationalState {
LINK_OPERSTATE_UNKNOWN,
LINK_OPERSTATE_DOWN,
LINK_OPERSTATE_UP,
LINK_OPERSTATE_DORMANT,
LINK_OPERSTATE_CARRIER,
LINK_OPERSTATE_DEGRADED,

2
src/network/networkd-manager.c
View File

@ -456,7 +456,7 @@ int manager_save(Manager *m) {
Iterator i;
_cleanup_free_ char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
LinkOperationalState operstate = LINK_OPERSTATE_UNKNOWN;
LinkOperationalState operstate = LINK_OPERSTATE_DOWN;
const char *operstate_str;
int r;

2
src/systemd/sd-network.h
View File

@ -50,7 +50,7 @@
_SD_BEGIN_DECLARATIONS;
/* Get overall operational state
* Possible states: unknown, dormant, carrier, degraded, routable
* Possible states: down, up, dormant, carrier, degraded, routable
* Possible return codes:
* -ENODATA: networkd is not aware of any links
*/