Network *network;
int r;
uint64_t ifindex;
- const char *devtype;
+ NetdevKind kind;
assert(m);
assert(device);
*ret = link;
- devtype = udev_device_get_devtype(device);
- if (streq_ptr(devtype, "bridge")) {
- r = bridge_set_link(m, link);
+ kind = netdev_kind_from_string(udev_device_get_devtype(device));
+ if (kind != _NETDEV_KIND_INVALID) {
+ r = netdev_set_link(m, kind, link);
if (r < 0 && r != -ENOENT)
return r;
}
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
- log_warning_link(link, "could not set route: %s", strerror(-r));
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not set route: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
/* we might have received an old reply after moving back to SETTING_ADDRESSES,
* ignore it */
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
- log_struct_link(LOG_ERR, link,
+ log_struct_link(LOG_WARNING, link,
"MESSAGE=%s: could not set address: %s",
link->ifname, strerror(-r),
"ERRNO=%d", -r,
return 1;
r = sd_rtnl_message_get_errno(m);
- if (r < 0 && r != -EEXIST)
- log_warning_link(link, "could not drop address: %s", strerror(-r));
+ if (r < 0 && r != -ENOENT)
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not drop address: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
return 1;
}
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r = 0;
- assert(bus);
assert(hostname);
log_debug("Setting transient hostname: '%s'", hostname);
+ if (!bus) { /* TODO: replace by assert when we can rely on kdbus */
+ log_info("Not connected to system bus, ignoring transient hostname.");
+ return 0;
+ }
+
r = sd_bus_message_new_method_call(
bus,
"org.freedesktop.hostname1",
return 1;
r = sd_rtnl_message_get_errno(m);
- if (r < 0 && r != -EEXIST)
- log_warning_link(link, "Could not set MTU: %s", strerror(-r));
+ if (r < 0)
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not set MTU: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
return 1;
}
assert(link->manager->event);
if (!link->dhcp) {
- link->dhcp = sd_dhcp_client_new(link->manager->event);
- if (!link->dhcp)
- return -ENOMEM;
+ r = sd_dhcp_client_new(&link->dhcp);
+ if (r < 0)
+ return r;
+
+ r = sd_dhcp_client_attach_event(link->dhcp, NULL, 0);
+ if (r < 0)
+ return r;
r = sd_dhcp_client_set_index(link->dhcp, link->ifindex);
if (r < 0)
if ((link->flags & IFF_UP) != (flags & IFF_UP))
log_info_link(link,
- "power %s", flags & IFF_UP ? "on": "off");
+ "link is %s", flags & IFF_UP ? "up": "down");
if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
if (flags & IFF_LOWER_UP) {
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning_link(link,
- "could not bring up interface: %s", strerror(-r));
+ log_struct_link(LOG_ERR, 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 r;
}
- r = sd_rtnl_message_link_set_flags(req, IFF_UP);
+ r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP);
if (r < 0) {
log_error_link(link, "Could not set link flags: %s", strerror(-r));
return r;
return 0;
}
-static int link_bridge_joined(Link *link) {
+static int link_enslaved(Link *link) {
int r;
assert(link);
- assert(link->state == LINK_STATE_JOINING_BRIDGE);
+ assert(link->state == LINK_STATE_ENSLAVING);
assert(link->network);
r = link_up(link);
return 0;
}
-static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
Link *link = userdata;
int r;
assert(link);
- assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED);
+ assert(link->state == LINK_STATE_ENSLAVING || link->state == LINK_STATE_FAILED);
assert(link->network);
+ link->enslaving --;
+
if (link->state == LINK_STATE_FAILED)
return 1;
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
log_struct_link(LOG_ERR, link,
- "MESSAGE=%s: could not join bridge '%s': %s",
- link->ifname, link->network->bridge->name, strerror(-r),
- BRIDGE(link->network->bridge),
+ "MESSAGE=%s: could not enslave: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
NULL);
link_enter_failed(link);
return 1;
}
- log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%s: joined bridge '%s'",
- link->network->bridge->name,
- BRIDGE(link->network->bridge),
- NULL);
+ log_debug_link(link, "enslaved");
- link_bridge_joined(link);
+ if (link->enslaving == 0)
+ link_enslaved(link);
return 1;
}
-static int link_enter_join_bridge(Link *link) {
+static int link_enter_enslave(Link *link) {
int r;
assert(link);
assert(link->network);
assert(link->state == _LINK_STATE_INVALID);
- link->state = LINK_STATE_JOINING_BRIDGE;
+ link->state = LINK_STATE_ENSLAVING;
- if (!link->network->bridge)
- return link_bridge_joined(link);
+ if (!link->network->bridge && !link->network->bond && !link->network->vlan)
+ return link_enslaved(link);
- log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%s: joining bridge '%s'",
- link->network->bridge->name,
- BRIDGE(link->network->bridge),
- NULL);
- log_debug_link(link, "joining bridge");
+ if (link->network->bridge) {
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%s: enslaving by '%s'",
+ link->ifname, link->network->bridge->name,
+ NETDEV(link->network->bridge),
+ NULL);
- r = bridge_join(link->network->bridge, link, &bridge_handler);
- if (r < 0) {
- log_struct_link(LOG_WARNING, link,
- "MESSAGE=%s: could not join bridge '%s': %s",
- link->network->bridge->name, strerror(-r),
- BRIDGE(link->network->bridge),
+ r = netdev_enslave(link->network->bridge, link, &enslave_handler);
+ if (r < 0) {
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not enslave by '%s': %s",
+ link->ifname, link->network->bridge->name, strerror(-r),
+ NETDEV(link->network->bridge),
+ NULL);
+ link_enter_failed(link);
+ return r;
+ }
+
+ link->enslaving ++;
+ }
+
+ if (link->network->vlan) {
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%s: enslaving by '%s'",
+ link->ifname, link->network->vlan->name,
+ NETDEV(link->network->vlan),
NULL);
- link_enter_failed(link);
- return r;
+
+ r = netdev_enslave(link->network->vlan, link, &enslave_handler);
+ if (r < 0) {
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not enslave by '%s': %s",
+ link->ifname, link->network->vlan->name,
+ strerror(-r), NETDEV(link->network->vlan),
+ NULL);
+ link_enter_failed(link);
+ return r;
+ }
+
+ link->enslaving ++;
}
return 0;
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning_link(link, "could not get state: %s", strerror(-r));
+ log_struct_link(LOG_ERR, link,
+ "MESSAGE=%s: could not get state: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
link_enter_failed(link);
+ return 1;
}
log_debug_link(link, "got link state");
return r;
}
- return link_enter_join_bridge(link);
+ return link_enter_enslave(link);
}
int link_update(Link *link, sd_rtnl_message *m) {