Link *link = userdata;
int r;
+ assert(link);
+
+ if (link->state == LINK_STATE_FAILED)
+ return 1;
+
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
log_warning("%s: could not bring up interface: %s",
link_enter_failed(link);
}
+ log_debug("%s: brought up interface", link->ifname);
+
return 1;
}
return r;
}
- if (!link->network->dhcp) {
- r = link_enter_set_addresses(link);
- if (r < 0)
- link_enter_failed(link);
- return r;
- }
+ if (!link->network->dhcp)
+ return link_enter_set_addresses(link);
return 0;
}
Link *link = userdata;
int r;
+ assert(link);
assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED);
assert(link->network);
Link *link = userdata;
int r;
+ assert(link);
+
+ if (link->state == LINK_STATE_FAILED)
+ return 1;
+
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
log_warning("%s: could not get state: %s",
link_enter_failed(link);
}
+ log_debug("%s: got link state", link->ifname);
+
link_update(link, m);
return 1;
return r;
}
- r = link_enter_join_bridge(link);
- if (r < 0)
- return r;
-
- return 0;
+ return link_enter_join_bridge(link);
}
static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
int prefixlen;
int r;
+ assert(link);
+
if (link->state == LINK_STATE_FAILED)
return;
if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
event == DHCP_EVENT_STOP) {
- address_drop(link->dhcp_address, link, address_drop_handler);
+ if (link->dhcp_address) {
+ address_drop(link->dhcp_address, link, address_drop_handler);
- address_free(link->dhcp_address);
- link->dhcp_address = NULL;
+ address_free(link->dhcp_address);
+ link->dhcp_address = NULL;
+ }
- route_free(link->dhcp_route);
- link->dhcp_route = NULL;
+ if (link->dhcp_route) {
+ route_free(link->dhcp_route);
+ link->dhcp_route = NULL;
+ }
}
r = sd_dhcp_client_get_address(client, &address);
int r;
assert(link);
+ assert(link->network);
assert(m);
+ if (link->state == LINK_STATE_FAILED)
+ return 0;
+
r = sd_rtnl_message_link_get_flags(m, &flags);
if (r < 0) {
log_warning("%s: could not get link flags", link->ifname);
} else if (!(link->flags & IFF_LOWER_UP) && flags & IFF_LOWER_UP) {
log_info("%s: connected", link->ifname);
- if (link->network && link->network->dhcp) {
+ if (link->network->dhcp) {
r = link_acquire_conf(link);
if (r < 0) {
link_enter_failed(link);
link->flags = flags;
- log_debug("%s: updated state", link->ifname);
+ log_debug("%s: updated link state", link->ifname);
return 0;
}