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=87f32f00a6c18f5ae4cdf9ebe3495cc1e980de35;hp=16255f9227aa7aab0abded0de5f67b1a5bceeff0;hb=1746cf2ad70d95c36064686d4f9b07a80e3bae99;hpb=fc25d7f8050f262fa6cafeb2a1032e6eb3e7b412

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 16255f922..87f32f00a 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -73,6 +73,15 @@ void link_free(Link *link) {
 
         assert(link->manager);
 
+        if (link->dhcp)
+                sd_dhcp_client_free(link->dhcp);
+
+        route_free(link->dhcp_route);
+        link->dhcp_route = NULL;
+
+        address_free(link->dhcp_address);
+        link->dhcp_address = NULL;
+
         hashmap_remove(link->manager->links, &link->ifindex);
 
         free(link->ifname);
@@ -120,38 +129,47 @@ int link_add(Manager *m, struct udev_device *device) {
 }
 
 static int link_enter_configured(Link *link) {
-        log_info("Link '%s' configured", link->ifname);
+        assert(link);
+        assert(link->state == LINK_STATE_SETTING_ROUTES);
+
+        log_info("%s: link configured", link->ifname);
 
         link->state = LINK_STATE_CONFIGURED;
 
         return 0;
 }
 
-static int link_enter_failed(Link *link) {
-        link->state = LINK_STATE_FAILED;
+static void link_enter_failed(Link *link) {
+        assert(link);
 
-        return 0;
+        log_warning("%s: failed", link->ifname);
+
+        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_SET_ROUTES || link->state == LINK_STATE_FAILED);
+        assert(link->route_messages > 0);
+        assert(link->state == LINK_STATE_SETTING_ADDRESSES ||
+               link->state == LINK_STATE_SETTING_ROUTES ||
+               link->state == LINK_STATE_FAILED);
 
-        link->rtnl_messages --;
+        link->route_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",
+                log_warning("%s: could not set route: %s",
                             link->ifname, strerror(-r));
 
-        if (link->rtnl_messages == 0) {
-                log_info("Routes set for link '%s'", link->ifname);
+        /* we might have received an old reply after moving back to SETTING_ADDRESSES,
+         * ignore it */
+        if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) {
+                log_debug("%s: routes set", link->ifname);
                 link_enter_configured(link);
         }
 
@@ -164,53 +182,63 @@ static int link_enter_set_routes(Link *link) {
 
         assert(link);
         assert(link->network);
-        assert(link->rtnl_messages == 0);
-        assert(link->state == LINK_STATE_ADDRESSES_SET);
+        assert(link->state == LINK_STATE_SETTING_ADDRESSES);
 
-        link->state = LINK_STATE_SET_ROUTES;
+        link->state = LINK_STATE_SETTING_ROUTES;
 
-        if (!link->network->routes)
+        if (!link->network->static_routes && !link->dhcp_route)
                 return link_enter_configured(link);
 
-        LIST_FOREACH(routes, route, link->network->routes) {
+        log_debug("%s: setting routes", link->ifname);
+
+        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);
-                        return link_enter_failed(link);
+                        log_warning("%s: could not set routes", link->ifname);
+                        link_enter_failed(link);
+                        return r;
                 }
 
-                link->rtnl_messages ++;
+                link->route_messages ++;
         }
 
-        return 0;
-}
+        if (link->dhcp_route) {
+                r = route_configure(link->dhcp_route, link, &route_handler);
+                if (r < 0) {
+                        log_warning("%s: could not set routes", link->ifname);
+                        link_enter_failed(link);
+                        return r;
+                }
 
-static int link_enter_addresses_set(Link *link) {
-        link->state = LINK_STATE_ADDRESSES_SET;
+                link->route_messages ++;
+        }
 
-        return link_enter_set_routes(link);
+        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_SET_ADDRESSES || link->state == LINK_STATE_FAILED);
+        assert(m);
+        assert(link);
+        assert(link->ifname);
+        assert(link->addr_messages > 0);
+        assert(link->state == LINK_STATE_SETTING_ADDRESSES || link->state == LINK_STATE_FAILED);
 
-        link->rtnl_messages --;
+        link->addr_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",
+                log_warning("%s: could not set address: %s",
                             link->ifname, strerror(-r));
 
-        if (link->rtnl_messages == 0) {
-                log_info("Addresses set for link '%s'", link->ifname);
-                link_enter_addresses_set(link);
+        if (link->addr_messages == 0) {
+                log_debug("%s: addresses set", link->ifname);
+                link_enter_set_routes(link);
         }
 
         return 1;
@@ -222,41 +250,62 @@ static int link_enter_set_addresses(Link *link) {
 
         assert(link);
         assert(link->network);
-        assert(link->rtnl_messages == 0);
+        assert(link->state != _LINK_STATE_INVALID);
+
+        link->state = LINK_STATE_SETTING_ADDRESSES;
 
-        if (!link->network->addresses)
-                return link_enter_addresses_set(link);
+        if (!link->network->static_addresses && !link->dhcp_address)
+                return link_enter_set_routes(link);
 
-        link->state = LINK_STATE_SET_ADDRESSES;
+        log_debug("%s: setting addresses", link->ifname);
 
-        LIST_FOREACH(addresses, address, link->network->addresses) {
+        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);
-                        return link_enter_failed(link);
+                        log_warning("%s: could not set addresses", link->ifname);
+                        link_enter_failed(link);
+                        return r;
+                }
+
+                link->addr_messages ++;
+        }
+
+        if (link->dhcp_address) {
+                r = address_configure(link->dhcp_address, link, &address_handler);
+                if (r < 0) {
+                        log_warning("%s: could not set addresses", link->ifname);
+                        link_enter_failed(link);
+                        return r;
                 }
 
-                link->rtnl_messages ++;
+                link->addr_messages ++;
         }
 
         return 0;
 }
 
-static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         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("Could not bring up interface '%s': %s",
+                log_warning("%s: could not bring up interface: %s",
                             link->ifname, strerror(-r));
                 link_enter_failed(link);
         }
 
+        log_debug("%s: brought up interface", link->ifname);
+
         return 1;
 }
 
-static int link_get(Link *link) {
+static int link_up(Link *link) {
         _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
         int r;
 
@@ -264,13 +313,21 @@ static int link_get(Link *link) {
         assert(link->manager);
         assert(link->manager->rtnl);
 
-        r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
+        log_debug("%s: bringing up link", link->ifname);
+
+        r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
         if (r < 0) {
-                log_error("Could not allocate RTM_GETLINK message");
+                log_error("Could not allocate RTM_SETLINK message");
                 return r;
         }
 
-        r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
+        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;
@@ -279,21 +336,100 @@ static int link_get(Link *link) {
         return 0;
 }
 
-static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int link_bridge_joined(Link *link) {
+        int r;
+
+        assert(link);
+        assert(link->state == LINK_STATE_JOINING_BRIDGE);
+        assert(link->network);
+
+        r = link_up(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
+
+        if (!link->network->dhcp)
+                return link_enter_set_addresses(link);
+
+        return 0;
+}
+
+static int bridge_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->network);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0) {
+                log_warning("%s: could not join bridge '%s': %s",
+                            link->ifname, link->network->bridge->name, strerror(-r));
+                link_enter_failed(link);
+                return 1;
+        } else
+                log_debug("%s: joined 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);
+
+        log_debug("%s: joining bridge", link->ifname);
+
+        r = bridge_join(link->network->bridge, link, &bridge_handler);
+        if (r < 0) {
+                log_warning("%s: could not join 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;
 
+        assert(link);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
         r = sd_rtnl_message_get_errno(m);
         if (r < 0) {
-                log_warning("Could not bring up interface '%s': %s",
+                log_warning("%s: could not get state: %s",
                             link->ifname, strerror(-r));
                 link_enter_failed(link);
         }
 
+        log_debug("%s: got link state", link->ifname);
+
+        link_update(link, m);
+
         return 1;
 }
 
-static int link_up(Link *link) {
+static int link_get(Link *link) {
         _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
         int r;
 
@@ -301,19 +437,15 @@ static int link_up(Link *link) {
         assert(link->manager);
         assert(link->manager->rtnl);
 
-        r = sd_rtnl_message_link_new(RTM_NEWLINK, link->ifindex, &req);
-        if (r < 0) {
-                log_error("Could not allocate RTM_NEWLINK message");
-                return r;
-        }
+        log_debug("%s: requesting link status", link->ifname);
 
-        r = sd_rtnl_message_link_set_flags(req, IFF_UP);
+        r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
         if (r < 0) {
-                log_error("Could not set link flags");
+                log_error("Could not allocate RTM_GETLINK message");
                 return r;
         }
 
-        r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
+        r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
         if (r < 0) {
                 log_error("Could not send rtnetlink message: %s", strerror(-r));
                 return r;
@@ -322,89 +454,222 @@ static int link_up(Link *link) {
         return 0;
 }
 
-static int link_enter_bridge_joined(Link *link) {
+int link_configure(Link *link) {
         int r;
 
-        link->state = LINK_STATE_BRIDGE_JOINED;
+        assert(link);
+        assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
 
-        r = link_up(link);
-        if (r < 0)
-                return link_enter_failed(link);
+        r = link_get(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
 
-        return link_enter_set_addresses(link);
+        return link_enter_join_bridge(link);
 }
 
-static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int address_drop_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);
+        assert(m);
+        assert(link);
+        assert(link->ifname);
 
         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));
-        else
-                log_info("Join interface '%s' to bridge: %s",
-                            link->ifname, link->network->bridge->name);
-
-        link_enter_bridge_joined(link);
+        if (r < 0 && r != -EEXIST)
+                log_warning("%s: could not drop address: %s",
+                            link->ifname, strerror(-r));
 
         return 1;
 }
 
-static int link_enter_join_bridge(Link *link) {
+static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
+        Link *link = userdata;
+        struct in_addr address;
+        struct in_addr netmask;
+        struct in_addr gateway;
+        int prefixlen;
         int r;
 
         assert(link);
-        assert(link->network);
 
-        if (!link->network->bridge)
-                return link_enter_bridge_joined(link);
+        if (link->state == LINK_STATE_FAILED)
+                return;
 
-        link->state = LINK_STATE_JOIN_BRIDGE;
+        if (event < 0) {
+                log_warning("%s: DHCP error: %s", link->ifname, strerror(-event));
+                link_enter_failed(link);
+                return;
+        }
 
-        r = bridge_join(link->network->bridge, link, &bridge_handler);
+        if (event == DHCP_EVENT_NO_LEASE)
+                log_debug("%s: IP address in use.", link->ifname);
+
+        if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
+            event == DHCP_EVENT_STOP) {
+                address_drop(link->dhcp_address, link, address_drop_handler);
+
+                address_free(link->dhcp_address);
+                link->dhcp_address = NULL;
+
+                route_free(link->dhcp_route);
+                link->dhcp_route = NULL;
+        }
+
+        r = sd_dhcp_client_get_address(client, &address);
         if (r < 0) {
-                log_warning("Could not join link '%s' to bridge '%s'", link->ifname,
-                            link->network->bridge->name);
-                return link_enter_failed(link);
+                log_warning("%s: DHCP error: no address", link->ifname);
+                link_enter_failed(link);
+                return;
         }
 
-        return 0;
+        r = sd_dhcp_client_get_netmask(client, &netmask);
+        if (r < 0) {
+                log_warning("%s: DHCP error: no netmask", link->ifname);
+                link_enter_failed(link);
+                return;
+        }
+
+        prefixlen = sd_dhcp_client_prefixlen(&netmask);
+        if (prefixlen < 0) {
+                log_warning("%s: DHCP error: no prefixlen", link->ifname);
+                link_enter_failed(link);
+                return;
+        }
+
+        r = sd_dhcp_client_get_router(client, &gateway);
+        if (r < 0) {
+                log_warning("%s: DHCP error: no router", link->ifname);
+                link_enter_failed(link);
+                return;
+        }
+
+        if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_IP_ACQUIRE) {
+                _cleanup_address_free_ Address *addr = NULL;
+                _cleanup_route_free_ Route *rt = NULL;
+
+                log_info("%s: received config over DHCPv4", link->ifname);
+
+                r = address_new_dynamic(&addr);
+                if (r < 0) {
+                        log_error("Could not allocate address");
+                        link_enter_failed(link);
+                        return;
+                }
+
+                addr->family = AF_INET;
+                addr->in_addr.in = address;
+                addr->prefixlen = prefixlen;
+                addr->netmask = netmask;
+
+                r = route_new_dynamic(&rt);
+                if (r < 0) {
+                        log_error("Could not allocate route");
+                        link_enter_failed(link);
+                        return;
+                }
+
+                rt->family = AF_INET;
+                rt->in_addr.in = gateway;
+
+                link->dhcp_address = addr;
+                link->dhcp_route = rt;
+                addr = NULL;
+                rt = NULL;
+
+                link_enter_set_addresses(link);
+        }
+
+        return;
 }
 
-int link_configure(Link *link) {
+static int link_acquire_conf(Link *link) {
         int r;
 
-        r = link_get(link);
-        if (r < 0)
-                return link_enter_failed(link);
+        assert(link);
+        assert(link->network);
+        assert(link->network->dhcp);
+        assert(link->manager);
+        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_set_index(link->dhcp, link->ifindex);
+                if (r < 0)
+                        return r;
+
+                r = sd_dhcp_client_set_mac(link->dhcp, &link->mac);
+                if (r < 0)
+                        return r;
 
-        r = link_enter_join_bridge(link);
+                r = sd_dhcp_client_set_callback(link->dhcp, dhcp_handler, link);
+                if (r < 0)
+                        return r;
+        }
+
+        r = sd_dhcp_client_start(link->dhcp);
         if (r < 0)
-                return link_enter_failed(link);
+                return r;
 
         return 0;
 }
 
-int link_update_flags(Link *link, unsigned flags) {
+int link_update(Link *link, sd_rtnl_message *m) {
+        unsigned flags;
+        int r;
+
         assert(link);
+        assert(link->network);
+        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);
+                return r;
+        }
 
         if (link->flags & IFF_UP && !(flags & IFF_UP))
-                log_info("Interface '%s' is down", link->ifname);
+                log_info("%s: interface is down", link->ifname);
         else if (!(link->flags & IFF_UP) && flags & IFF_UP)
-                log_info("Interface '%s' is up", link->ifname);
+                log_info("%s: interface is up", link->ifname);
+
+        if (link->flags & IFF_LOWER_UP && !(flags & IFF_LOWER_UP)) {
+                log_info("%s: disconnected", 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);
+                if (link->network->dhcp) {
+                        r = sd_dhcp_client_stop(link->dhcp);
+                        if (r < 0) {
+                                link_enter_failed(link);
+                                return r;
+                        }
+                }
+        } else if (!(link->flags & IFF_LOWER_UP) && flags & IFF_LOWER_UP) {
+                log_info("%s: connected", link->ifname);
+
+                if (link->network->dhcp) {
+                        r = link_acquire_conf(link);
+                        if (r < 0) {
+                                link_enter_failed(link);
+                                return r;
+                        }
+                }
+        }
 
         link->flags = flags;
 
+        log_debug("%s: updated link state", link->ifname);
+
         return 0;
 }