summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-09-04 14:05:54 +0200
committerTom Gundersen <teg@jklm.no>2014-09-04 14:10:57 +0200
commita61bb41c29c370a7e64285525ec35baac8944149 (patch)
treebfeadf235281b7ee83c647d7c28e3843429624b4
parent83a1ff25e5228b0a5b2cc942fd4f964d10bb73b0 (diff)
networkd: move carrier gained/lost handling from link_update_flags() to link_update()
This allows us also to simplify link_has_carrier() a bit.
-rw-r--r--src/network/networkd-link.c74
-rw-r--r--src/network/networkd-link.h2
2 files changed, 38 insertions, 38 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index dff3270f2a..57e719478a 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -863,15 +863,15 @@ static int link_acquire_conf(Link *link) {
return 0;
}
-bool link_has_carrier(unsigned flags, uint8_t operstate) {
+bool link_has_carrier(Link *link) {
/* see Documentation/networking/operstates.txt in the kernel sources */
- if (operstate == IF_OPER_UP)
+ if (link->kernel_operstate == IF_OPER_UP)
return true;
- if (operstate == IF_OPER_UNKNOWN)
+ if (link->kernel_operstate == IF_OPER_UNKNOWN)
/* operstate may not be implemented, so fall back to flags */
- if ((flags & IFF_LOWER_UP) && !(flags & IFF_DORMANT))
+ if ((link->flags & IFF_LOWER_UP) && !(link->flags & IFF_DORMANT))
return true;
return false;
@@ -885,7 +885,6 @@ bool link_has_carrier(unsigned flags, uint8_t operstate) {
static int link_update_flags(Link *link, sd_rtnl_message *m) {
unsigned flags, unknown_flags_added, unknown_flags_removed, unknown_flags;
uint8_t operstate;
- bool carrier_gained = false, carrier_lost = false;
int r;
assert(link);
@@ -949,40 +948,11 @@ static int link_update_flags(Link *link, sd_rtnl_message *m) {
unknown_flags_removed);
}
- carrier_gained = !link_has_carrier(link->flags, link->kernel_operstate) &&
- link_has_carrier(flags, operstate);
- carrier_lost = link_has_carrier(link->flags, link->kernel_operstate) &&
- !link_has_carrier(flags, operstate);
-
link->flags = flags;
link->kernel_operstate = operstate;
link_save(link);
- if (link->state == LINK_STATE_FAILED ||
- link->state == LINK_STATE_UNMANAGED)
- return 0;
-
- if (carrier_gained) {
- log_info_link(link, "gained carrier");
-
- if (link->network) {
- r = link_acquire_conf(link);
- if (r < 0) {
- link_enter_failed(link);
- return r;
- }
- }
- } else if (carrier_lost) {
- log_info_link(link, "lost carrier");
-
- r = link_stop_clients(link);
- if (r < 0) {
- link_enter_failed(link);
- return r;
- }
- }
-
return 0;
}
@@ -1244,7 +1214,7 @@ static int link_configure(Link *link) {
return r;
}
- if (link_has_carrier(link->flags, link->kernel_operstate)) {
+ if (link_has_carrier(link)) {
r = link_acquire_conf(link);
if (r < 0)
return r;
@@ -1554,6 +1524,7 @@ int link_update(Link *link, sd_rtnl_message *m) {
struct ether_addr mac;
const char *ifname;
uint32_t mtu;
+ bool had_carrier, carrier_gained, carrier_lost;
int r;
assert(link);
@@ -1650,7 +1621,36 @@ int link_update(Link *link, sd_rtnl_message *m) {
}
}
- return link_update_flags(link, m);
+ had_carrier = link_has_carrier(link);
+
+ r = link_update_flags(link, m);
+ if (r < 0)
+ return r;
+
+ carrier_gained = !had_carrier && link_has_carrier(link);
+ carrier_lost = had_carrier && !link_has_carrier(link);
+
+ if (carrier_gained) {
+ log_info_link(link, "gained carrier");
+
+ if (link->network) {
+ r = link_acquire_conf(link);
+ if (r < 0) {
+ link_enter_failed(link);
+ return r;
+ }
+ }
+ } else if (carrier_lost) {
+ log_info_link(link, "lost carrier");
+
+ r = link_stop_clients(link);
+ if (r < 0) {
+ link_enter_failed(link);
+ return r;
+ }
+ }
+
+ return 0;
}
static void link_update_operstate(Link *link) {
@@ -1659,7 +1659,7 @@ static void link_update_operstate(Link *link) {
if (link->kernel_operstate == IF_OPER_DORMANT)
link->operstate = LINK_OPERSTATE_DORMANT;
- else if (link_has_carrier(link->flags, link->kernel_operstate)) {
+ else if (link_has_carrier(link)) {
Address *address;
uint8_t scope = RT_SCOPE_NOWHERE;
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 0f73ec7f9b..7acf404f87 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -113,7 +113,7 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use
int link_save(Link *link);
-bool link_has_carrier(unsigned flags, uint8_t operstate);
+bool link_has_carrier(Link *link);
int link_set_mtu(Link *link, uint32_t mtu);
int link_set_hostname(Link *link, const char *hostname);