return 0;
}
-int link_add(Manager *m, struct udev_device *device, Link **ret) {
- Link *link = NULL;
- Network *network;
- int r;
-
- assert(m);
- assert(device);
-
- r = link_new(m, device, &link);
- if (r < 0)
- return r;
-
- *ret = link;
-
- r = network_get(m, device, &network);
- if (r < 0)
- return r == -ENOENT ? 0 : r;
-
- r = network_apply(m, network, link);
- if (r < 0)
- return r;
-
- return 0;
-}
-
static int link_enter_configured(Link *link) {
assert(link);
assert(link->state == LINK_STATE_SETTING_ROUTES);
if (link->state == LINK_STATE_FAILED)
return 0;
- if (link->flags == flags) {
- log_debug_link(link, "link status unchanged: %#.8x", flags);
+ if (link->flags == flags)
return 0;
- }
if ((link->flags & IFF_UP) != (flags & IFF_UP))
log_info_link(link,
}
}
- log_debug_link(link,
- "link status updated: %#.8x -> %#.8x", link->flags, flags);
+ log_debug_link(link, "link status updated: %#.8x -> %#.8x",
+ link->flags, flags);
link->flags = flags;
return 1;
r = sd_rtnl_message_get_errno(m);
- if (r < 0) {
- log_struct_link(LOG_ERR, link,
+ if (r >= 0)
+ link_update_flags(link, link->flags | IFF_UP);
+ else
+ log_struct_link(LOG_WARNING, link,
"MESSAGE=%s: could not bring up interface: %s",
link->ifname, strerror(-r),
"ERRNO=%d", -r,
NULL);
- link_enter_failed(link);
- return 1;
- }
-
- link_update_flags(link, link->flags | IFF_UP);
-
return 1;
}
return 1;
}
- log_debug_link(link, "got link state");
-
link_update(link, m);
return 1;
return 0;
}
-int link_configure(Link *link) {
+static int link_configure(Link *link) {
int r;
assert(link);
- assert(link->network);
assert(link->state == _LINK_STATE_INVALID);
r = link_getlink(link);
- if (r < 0) {
- link_enter_failed(link);
+ if (r < 0)
return r;
- }
return link_enter_enslave(link);
}
+int link_add(Manager *m, struct udev_device *device, Link **ret) {
+ Link *link = NULL;
+ Network *network;
+ int r;
+
+ assert(m);
+ assert(device);
+
+ r = link_new(m, device, &link);
+ if (r < 0)
+ return r;
+
+ *ret = link;
+
+ r = network_get(m, device, &network);
+ if (r < 0)
+ return r == -ENOENT ? 0 : r;
+
+ r = network_apply(m, network, link);
+ if (r < 0)
+ return r;
+
+ r = link_configure(link);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
int link_update(Link *link, sd_rtnl_message *m) {
unsigned flags;
- void *data;
- uint16_t type;
int r;
assert(link);
+ assert(link->network);
assert(m);
if (link->state == LINK_STATE_FAILED)
return 0;
+ if (link->network->dhcp && link->network->dhcp_mtu &&
+ !link->original_mtu) {
+ r = sd_rtnl_message_read_u16(m, IFLA_MTU, &link->original_mtu);
+ if (r >= 0)
+ log_debug_link(link, "saved original MTU: %"
+ PRIu16, link->original_mtu);
+ }
+
+ r = sd_rtnl_message_read_ether_addr(m, IFLA_ADDRESS, &link->mac);
+ if (r >= 0) {
+ log_debug_link(link, "MAC address: "
+ "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+ link->mac.ether_addr_octet[0],
+ link->mac.ether_addr_octet[1],
+ link->mac.ether_addr_octet[2],
+ link->mac.ether_addr_octet[3],
+ link->mac.ether_addr_octet[4],
+ link->mac.ether_addr_octet[5]);
+ }
+
r = sd_rtnl_message_link_get_flags(m, &flags);
if (r < 0) {
log_warning_link(link, "Could not get link flags");
return r;
}
- while (sd_rtnl_message_read(m, &type, &data) > 0) {
- if (type == IFLA_MTU && link->network->dhcp &&
- link->network->dhcp_mtu && !link->original_mtu) {
- link->original_mtu = *(uint16_t *) data;
- log_debug_link(link, "saved original MTU: %" PRIu16,
- link->original_mtu);
- }
- }
-
return link_update_flags(link, flags);
}