chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: add more asserts and ignore all events when link has failed
[elogind.git]
/
src
/
network
/
networkd-link.c
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index 9d942f436b3ad0e0307ad461cdd87c4e98c6e2e2..87f32f00a6c18f5ae4cdf9ebe3495cc1e980de35 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-288,6
+288,11
@@
static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
Link *link = userdata;
int r;
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",
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
log_warning("%s: could not bring up interface: %s",
@@
-295,6
+300,8
@@
static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
link_enter_failed(link);
}
link_enter_failed(link);
}
+ log_debug("%s: brought up interface", link->ifname);
+
return 1;
}
return 1;
}
@@
-342,12
+349,8
@@
static int link_bridge_joined(Link *link) {
return r;
}
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;
}
return 0;
}
@@
-356,6
+359,7
@@
static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
Link *link = userdata;
int r;
Link *link = userdata;
int r;
+ assert(link);
assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED);
assert(link->network);
assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED);
assert(link->network);
@@
-406,6
+410,11
@@
static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
Link *link = userdata;
int r;
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",
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
log_warning("%s: could not get state: %s",
@@
-413,6
+422,8
@@
static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
link_enter_failed(link);
}
link_enter_failed(link);
}
+ log_debug("%s: got link state", link->ifname);
+
link_update(link, m);
return 1;
link_update(link, m);
return 1;
@@
-456,11
+467,7
@@
int link_configure(Link *link) {
return r;
}
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) {
}
static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
@@
-490,6
+497,8
@@
static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
int prefixlen;
int r;
int prefixlen;
int r;
+ assert(link);
+
if (link->state == LINK_STATE_FAILED)
return;
if (link->state == LINK_STATE_FAILED)
return;
@@
-619,8
+628,12
@@
int link_update(Link *link, sd_rtnl_message *m) {
int r;
assert(link);
int r;
assert(link);
+ assert(link->network);
assert(m);
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);
r = sd_rtnl_message_link_get_flags(m, &flags);
if (r < 0) {
log_warning("%s: could not get link flags", link->ifname);
@@
-645,7
+658,7
@@
int link_update(Link *link, sd_rtnl_message *m) {
} else if (!(link->flags & IFF_LOWER_UP) && flags & IFF_LOWER_UP) {
log_info("%s: connected", 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);
r = link_acquire_conf(link);
if (r < 0) {
link_enter_failed(link);
@@
-656,7
+669,7
@@
int link_update(Link *link, sd_rtnl_message *m) {
link->flags = flags;
link->flags = flags;
- log_debug("%s: updated state", link->ifname);
+ log_debug("%s: updated
link
state", link->ifname);
return 0;
}
return 0;
}