X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=ea94966f18fd77f4389ecbceca1da66d63c54407;hp=d0a3dccd9bc5a75eaa19013a2bf083c1ddb2e9af;hb=f048a16b464295a4e0a4f4c1210f06343ad31231;hpb=8cd11a0f0f4ca05199e1166f6a07472b296f7455

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index d0a3dccd9..ea94966f1 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -28,8 +28,9 @@
 
 int link_new(Manager *manager, struct udev_device *device, Link **ret) {
         _cleanup_link_free_ Link *link = NULL;
-        uint64_t ifindex;
         const char *mac;
+        struct ether_addr *mac_addr;
+        const char *ifname;
         int r;
 
         assert(device);
@@ -39,19 +40,24 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) {
         if (!link)
                 return -ENOMEM;
 
-        ifindex = udev_device_get_ifindex(device);
-        if (ifindex <= 0)
+        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->ifindex = ifindex;
-        link->manager = manager;
+        ifname = udev_device_get_sysname(device);
+        link->ifname = strdup(ifname);
 
-        r = hashmap_put(manager->links, &ifindex, link);
+        r = hashmap_put(manager->links, &link->ifindex, link);
         if (r < 0)
                 return r;
 
@@ -65,9 +71,11 @@ void link_free(Link *link) {
         if (!link)
                 return;
 
-        network_free(link->network);
+        assert(link->manager);
+
+        hashmap_remove(link->manager->links, &link->ifindex);
 
-        hashmap_remove(link->manager->links, link);
+        free(link->ifname);
 
         free(link);
 }
@@ -77,6 +85,7 @@ int link_add(Manager *m, struct udev_device *device) {
         Network *network;
         int r;
         uint64_t ifindex;
+        const char *devtype;
 
         assert(m);
         assert(device);
@@ -88,10 +97,17 @@ int link_add(Manager *m, struct udev_device *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;
@@ -103,23 +119,322 @@ int link_add(Manager *m, struct udev_device *device) {
         return 0;
 }
 
-int link_up(Manager *manager, Link *link) {
+static int link_enter_configured(Link *link) {
+        assert(link);
+        assert(link->state == LINK_STATE_SETTING_ROUTES);
+
+        log_info("Link '%s' configured", link->ifname);
+
+        link->state = LINK_STATE_CONFIGURED;
+
+        return 0;
+}
+
+static void link_enter_failed(Link *link) {
+        assert(link);
+
+        link->state = LINK_STATE_FAILED;
+}
+
+static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        assert(link->rtnl_messages > 0);
+        assert(link->state == LINK_STATE_SETTING_ROUTES || link->state == LINK_STATE_FAILED);
+
+        link->rtnl_messages --;
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0 && r != -EEXIST)
+                log_warning("Could not set route on interface '%s': %s",
+                            link->ifname, strerror(-r));
+
+        if (link->rtnl_messages == 0) {
+                log_info("Routes set for link '%s'", link->ifname);
+                link_enter_configured(link);
+        }
+
+        return 1;
+}
+
+static int link_enter_set_routes(Link *link) {
+        Route *route;
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->rtnl_messages == 0);
+        assert(link->state == LINK_STATE_SETTING_ADDRESSES);
+
+        link->state = LINK_STATE_SETTING_ROUTES;
+
+        if (!link->network->static_routes)
+                return link_enter_configured(link);
+
+        LIST_FOREACH(static_routes, route, link->network->static_routes) {
+                r = route_configure(route, link, &route_handler);
+                if (r < 0) {
+                        log_warning("Could not set routes for link '%s'", link->ifname);
+                        link_enter_failed(link);
+                        return r;
+                }
+
+                link->rtnl_messages ++;
+        }
+
+        return 0;
+}
+
+static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        assert(link->rtnl_messages > 0);
+        assert(link->state == LINK_STATE_SETTING_ADDRESSES || link->state == LINK_STATE_FAILED);
+
+        link->rtnl_messages --;
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0 && r != -EEXIST)
+                log_warning("Could not set address on interface '%s': %s",
+                            link->ifname, strerror(-r));
+
+        if (link->rtnl_messages == 0) {
+                log_info("Addresses set for link '%s'", link->ifname);
+                link_enter_set_routes(link);
+        }
+
+        return 1;
+}
+
+static int link_enter_set_addresses(Link *link) {
+        Address *address;
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->state == LINK_STATE_JOINING_BRIDGE);
+        assert(link->rtnl_messages == 0);
+
+        link->state = LINK_STATE_SETTING_ADDRESSES;
+
+        if (!link->network->static_addresses)
+                return link_enter_set_routes(link);
+
+        LIST_FOREACH(static_addresses, address, link->network->static_addresses) {
+                r = address_configure(address, link, &address_handler);
+                if (r < 0) {
+                        log_warning("Could not set addresses for link '%s'", link->ifname);
+                        link_enter_failed(link);
+                        return r;
+                }
+
+                link->rtnl_messages ++;
+        }
+
+        return 0;
+}
+
+static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0) {
+                log_warning("Could not bring up interface '%s': %s",
+                            link->ifname, strerror(-r));
+                link_enter_failed(link);
+        }
+
+        return 1;
+}
+
+static int link_up(Link *link) {
+        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+        int r;
+
+        assert(link);
+        assert(link->manager);
+        assert(link->manager->rtnl);
+
+        r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
+        if (r < 0) {
+                log_error("Could not allocate RTM_SETLINK message");
+                return r;
+        }
+
+        r = sd_rtnl_message_link_set_flags(req, IFF_UP);
+        if (r < 0) {
+                log_error("Could not set link flags");
+                return r;
+        }
+
+        r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
+        if (r < 0) {
+                log_error("Could not send rtnetlink message: %s", strerror(-r));
+                return r;
+        }
+
+        return 0;
+}
+
+static int link_bridge_joined(Link *link) {
+        int r;
+
+        assert(link);
+        assert(link->state == LINK_STATE_JOINING_BRIDGE);
+
+        r = link_up(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
+
+        r = link_enter_set_addresses(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
+
+        return 0;
+}
+
+static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED);
+        assert(link->network);
+
+        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': %s",
+                            link->ifname, link->network->bridge->name, strerror(-r));
+                link_enter_failed(link);
+                return 1;
+        } else
+                log_info("Join interface '%s' to bridge: %s",
+                            link->ifname, link->network->bridge->name);
+
+        link_bridge_joined(link);
+
+        return 1;
+}
+
+static int link_enter_join_bridge(Link *link) {
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
+
+        link->state = LINK_STATE_JOINING_BRIDGE;
+
+        if (!link->network->bridge)
+                return link_bridge_joined(link);
+
+        r = bridge_join(link->network->bridge, link, &bridge_handler);
+        if (r < 0) {
+                log_warning("Could not join link '%s' to bridge '%s'", link->ifname,
+                            link->network->bridge->name);
+                link_enter_failed(link);
+                return r;
+        }
+
+        return 0;
+}
+
+static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0) {
+                log_warning("Could not get state of interface '%s': %s",
+                            link->ifname, strerror(-r));
+                link_enter_failed(link);
+        }
+
+        return 1;
+}
+
+static int link_get(Link *link) {
         _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
         int r;
 
-        r = sd_rtnl_message_link_new(RTM_NEWLINK, link->ifindex, 0, IFF_UP, &req);
+        assert(link);
+        assert(link->manager);
+        assert(link->manager->rtnl);
+
+        r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
         if (r < 0) {
-                log_error("Could not allocate RTM_NEWLINK message");
+                log_error("Could not allocate RTM_GETLINK message");
                 return r;
         }
 
-        r = sd_rtnl_call(manager->rtnl, req, 0, NULL);
+        r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
         if (r < 0) {
-                log_error("Could not UP link: %s", strerror(-r));
+                log_error("Could not send rtnetlink message: %s", strerror(-r));
                 return r;
         }
 
-        log_info("Link is UP");
+        return 0;
+}
+
+int link_configure(Link *link) {
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
+
+        r = link_get(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
+
+        r = link_enter_join_bridge(link);
+        if (r < 0)
+                return r;
+
+        return 0;
+}
+
+int link_update(Link *link, sd_rtnl_message *m) {
+        unsigned flags;
+        int r;
+
+        assert(link);
+        assert(m);
+
+        r = sd_rtnl_message_link_get_flags(m, &flags);
+        if (r < 0) {
+                log_warning("Could not get link flags of '%s'", link->ifname);
+                return r;
+        }
+
+        if (link->flags & IFF_UP && !(flags & IFF_UP))
+                log_info("Interface '%s' is down", link->ifname);
+        else if (!(link->flags & IFF_UP) && flags & IFF_UP)
+                log_info("Interface '%s' is up", link->ifname);
+
+        if (link->flags & IFF_LOWER_UP && !(flags & IFF_LOWER_UP))
+                log_info("Interface '%s' is disconnected", link->ifname);
+        else if (!(link->flags & IFF_LOWER_UP) && flags & IFF_LOWER_UP)
+                log_info("Interface '%s' is connected", link->ifname);
+
+        link->flags = flags;
 
         return 0;
 }