int link_new(Manager *manager, struct udev_device *device, Link **ret) {
_cleanup_link_free_ Link *link = NULL;
const char *mac;
+ struct ether_addr *mac_addr;
+ const char *ifname;
int r;
assert(device);
if (!link)
return -ENOMEM;
+ link->manager = manager;
+ link->state = _LINK_STATE_INVALID;
+
link->ifindex = udev_device_get_ifindex(device);
if (link->ifindex <= 0)
return -EINVAL;
mac = udev_device_get_sysattr_value(device, "address");
- if (!mac)
- return -EINVAL;
+ if (mac) {
+ mac_addr = ether_aton(mac);
+ if (mac_addr)
+ memcpy(&link->mac, mac_addr, sizeof(struct ether_addr));
+ }
- memcpy(&link->mac.ether_addr_octet[0], ether_aton(mac), ETH_ALEN);
- link->manager = manager;
- link->state = _LINK_STATE_INVALID;
+ ifname = udev_device_get_sysname(device);
+ link->ifname = strdup(ifname);
r = hashmap_put(manager->links, &link->ifindex, link);
if (r < 0)
hashmap_remove(link->manager->links, &link->ifindex);
+ free(link->ifname);
+
free(link);
}
Network *network;
int r;
uint64_t ifindex;
+ const char *devtype;
assert(m);
assert(device);
r = link_new(m, device, &link);
if (r < 0) {
- log_error("could not create link: %s", strerror(-r));
+ log_error("Could not create link: %s", strerror(-r));
return r;
}
+ devtype = udev_device_get_devtype(device);
+ if (streq_ptr(devtype, "bridge")) {
+ r = bridge_set_link(m, link);
+ if (r < 0)
+ return r == -ENOENT ? 0 : r;
+ }
+
r = network_get(m, device, &network);
if (r < 0)
return r == -ENOENT ? 0 : r;
}
static int link_enter_configured(Link *link) {
- log_info("Link configured successfully.");
+ log_info("Link '%s' configured", link->ifname);
link->state = LINK_STATE_CONFIGURED;
}
static int link_enter_failed(Link *link) {
- log_warning("Could not configure link.");
+ log_warning("Could not configure link '%s'", link->ifname);
link->state = LINK_STATE_FAILED;
}
static int link_enter_routes_set(Link *link) {
- log_info("Routes set for link %u", (unsigned)link->ifindex);
+ log_info("Routes set for link '%s'", link->ifname);
if (link_is_up(link))
return link_enter_configured(link);
return 1;
r = sd_rtnl_message_get_errno(m);
- if (r < 0 && r != -EEXIST) {
- log_warning("Could not set route on interface %u: %s",
- (unsigned)link->ifindex, strerror(-r));
- return link_enter_failed(link);
- }
+ if (r < 0 && r != -EEXIST)
+ log_warning("Could not set route on interface '%s': %s",
+ link->ifname, strerror(-r));
if (link->rtnl_messages == 0)
return link_enter_routes_set(link);
LIST_FOREACH(routes, route, link->network->routes) {
r = route_configure(route, link, &route_handler);
if (r < 0)
- link_enter_failed(link);
+ return link_enter_failed(link);
+
+ link->rtnl_messages ++;
}
return 0;
}
static int link_enter_addresses_set(Link *link) {
- log_info("Addresses set for link %u", (unsigned)link->ifindex);
+ log_info("Addresses set for link '%s'", link->ifname);
link->state = LINK_STATE_ADDRESSES_SET;
return 1;
r = sd_rtnl_message_get_errno(m);
- if (r < 0 && r != -EEXIST) {
- log_warning("Could not set address on interface %u: %s",
- (unsigned)link->ifindex, strerror(-r));
- link_enter_failed(link);
- }
+ if (r < 0 && r != -EEXIST)
+ log_warning("Could not set address on interface '%s': %s",
+ link->ifname, strerror(-r));
if (link->rtnl_messages == 0)
link_enter_addresses_set(link);
LIST_FOREACH(addresses, address, link->network->addresses) {
r = address_configure(address, link, &address_handler);
if (r < 0)
- link_enter_failed(link);
+ return link_enter_failed(link);
+
+ link->rtnl_messages ++;
}
return 0;
int r;
r = sd_rtnl_message_get_errno(m);
- if (r < 0) {
- log_warning("Could not bring up interface %u: %s",
- (unsigned)link->ifindex, strerror(-r));
- return link_enter_failed(link);
- }
+ if (r < 0)
+ log_warning("Could not bring up interface '%s': %s",
+ link->ifname, strerror(-r));
link->flags |= IFF_UP;
- log_info("Link is UP.");
+ log_info("Link '%s' is up", link->ifname);
if (link->state == LINK_STATE_ROUTES_SET)
return link_enter_configured(link);
return 0;
}
-int link_configure(Link *link) {
+static int link_enter_bridge_joined(Link *link) {
int r;
r = link_up(link);
if (r < 0)
return link_enter_failed(link);
- r = link_enter_set_addresses(link);
+ link->state = LINK_STATE_BRIDGE_JOINED;
+
+ return link_enter_set_addresses(link);
+}
+
+static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+ Link *link = userdata;
+ int r;
+
+ assert(link->state == LINK_STATE_JOIN_BRIDGE || link->state == LINK_STATE_FAILED);
+
+ if (link->state == LINK_STATE_FAILED)
+ return 1;
+
+ r = sd_rtnl_message_get_errno(m);
+ if (r < 0)
+ log_warning("Could not join interface '%s' to bridge: %s",
+ link->ifname, strerror(-r));
+
+ link_enter_bridge_joined(link);
+
+ return 1;
+}
+
+static int link_enter_join_bridge(Link *link) {
+ int r;
+
+ assert(link);
+ assert(link->network);
+
+ if (!link->network->bridge)
+ return link_enter_bridge_joined(link);
+
+ link->state = LINK_STATE_JOIN_BRIDGE;
+
+ r = bridge_join(link->network->bridge, link, &bridge_handler);
+ if (r < 0)
+ return link_enter_failed(link);
+
+ return 0;
+}
+
+int link_configure(Link *link) {
+ int r;
+
+ r = link_enter_join_bridge(link);
if (r < 0)
return link_enter_failed(link);