X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=5e763069f3622367e430a662c62a9cac45fc3f4f;hp=f021918311234aa0c3b038181de7305878ff7e13;hb=672682a6b9d6fb6a3722c3fea1a93b4831747b54;hpb=377a218f876507fb8be9c21ef4121fa2576ec317

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index f02191831..5e763069f 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -75,14 +75,8 @@ 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;
+        sd_dhcp_client_free(link->dhcp_client);
+        sd_dhcp_lease_unref(link->dhcp_lease);
 
         hashmap_remove(link->manager->links, &link->ifindex);
 
@@ -96,7 +90,6 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) {
         Network *network;
         int r;
         uint64_t ifindex;
-        NetdevKind kind;
 
         assert(m);
         assert(device);
@@ -114,13 +107,6 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) {
 
         *ret = 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 = network_get(m, device, &network);
         if (r < 0)
                 return r == -ENOENT ? 0 : r;
@@ -184,7 +170,7 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 }
 
 static int link_enter_set_routes(Link *link) {
-        Route *route;
+        Route *rt;
         int r;
 
         assert(link);
@@ -193,13 +179,13 @@ static int link_enter_set_routes(Link *link) {
 
         link->state = LINK_STATE_SETTING_ROUTES;
 
-        if (!link->network->static_routes && !link->dhcp_route)
+        if (!link->network->static_routes && !link->dhcp_lease)
                 return link_enter_configured(link);
 
         log_debug_link(link, "setting routes");
 
-        LIST_FOREACH(static_routes, route, link->network->static_routes) {
-                r = route_configure(route, link, &route_handler);
+        LIST_FOREACH(static_routes, rt, link->network->static_routes) {
+                r = route_configure(rt, link, &route_handler);
                 if (r < 0) {
                         log_warning_link(link,
                                          "could not set routes: %s", strerror(-r));
@@ -210,8 +196,28 @@ static int link_enter_set_routes(Link *link) {
                 link->route_messages ++;
         }
 
-        if (link->dhcp_route) {
-                r = route_configure(link->dhcp_route, link, &route_handler);
+        if (link->dhcp_lease) {
+                _cleanup_route_free_ Route *route = NULL;
+                struct in_addr gateway;
+
+                r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway);
+                if (r < 0) {
+                        log_warning_link(link, "DHCP error: no router: %s",
+                                         strerror(-r));
+                        return r;
+                }
+
+                r = route_new_dynamic(&route);
+                if (r < 0) {
+                        log_error_link(link, "Could not allocate route: %s",
+                                       strerror(-r));
+                        return r;
+                }
+
+                route->family = AF_INET;
+                route->in_addr.in = gateway;
+
+                r = route_configure(route, link, &route_handler);
                 if (r < 0) {
                         log_warning_link(link,
                                          "could not set routes: %s", strerror(-r));
@@ -257,7 +263,7 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 }
 
 static int link_enter_set_addresses(Link *link) {
-        Address *address;
+        Address *ad;
         int r;
 
         assert(link);
@@ -266,13 +272,13 @@ static int link_enter_set_addresses(Link *link) {
 
         link->state = LINK_STATE_SETTING_ADDRESSES;
 
-        if (!link->network->static_addresses && !link->dhcp_address)
+        if (!link->network->static_addresses && !link->dhcp_lease)
                 return link_enter_set_routes(link);
 
         log_debug_link(link, "setting addresses");
 
-        LIST_FOREACH(static_addresses, address, link->network->static_addresses) {
-                r = address_configure(address, link, &address_handler);
+        LIST_FOREACH(static_addresses, ad, link->network->static_addresses) {
+                r = address_configure(ad, link, &address_handler);
                 if (r < 0) {
                         log_warning_link(link,
                                          "could not set addresses: %s", strerror(-r));
@@ -283,8 +289,41 @@ static int link_enter_set_addresses(Link *link) {
                 link->addr_messages ++;
         }
 
-        if (link->dhcp_address) {
-                r = address_configure(link->dhcp_address, link, &address_handler);
+        if (link->dhcp_lease) {
+                _cleanup_address_free_ Address *address = NULL;
+                struct in_addr addr;
+                struct in_addr netmask;
+                unsigned prefixlen;
+
+                r = sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
+                if (r < 0) {
+                        log_warning_link(link, "DHCP error: no address: %s",
+                                         strerror(-r));
+                        return r;
+                }
+
+                r = sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
+                if (r < 0) {
+                        log_warning_link(link, "DHCP error: no netmask: %s",
+                                         strerror(-r));
+                        return r;
+                }
+
+                prefixlen = net_netmask_to_prefixlen(&netmask);
+
+                r = address_new_dynamic(&address);
+                if (r < 0) {
+                        log_error_link(link, "Could not allocate address: %s",
+                                       strerror(-r));
+                        return r;
+                }
+
+                address->family = AF_INET;
+                address->in_addr.in = addr;
+                address->prefixlen = prefixlen;
+                address->broadcast.s_addr = addr.s_addr | ~netmask.s_addr;
+
+                r = address_configure(address, link, &address_handler);
                 if (r < 0) {
                         log_warning_link(link,
                                          "could not set addresses: %s", strerror(-r));
@@ -418,175 +457,203 @@ static int link_set_mtu(Link *link, uint32_t mtu) {
         return 0;
 }
 
-static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
-        Link *link = userdata;
-        struct in_addr address;
+static int dhcp_lease_lost(Link *link) {
+        _cleanup_address_free_ Address *address = NULL;
+        struct in_addr addr;
         struct in_addr netmask;
-        struct in_addr gateway;
         unsigned prefixlen;
         int r;
 
         assert(link);
-        assert(link->network);
-        assert(link->manager);
+        assert(link->dhcp_lease);
 
-        if (link->state == LINK_STATE_FAILED)
-                return;
+        r = address_new_dynamic(&address);
+        if (r >= 0) {
+                sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
+                sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
+                prefixlen = net_netmask_to_prefixlen(&netmask);
 
-        if (event < 0) {
-                log_warning_link(link, "DHCP error: %s", strerror(-event));
-                link_enter_failed(link);
-                return;
+                address->family = AF_INET;
+                address->in_addr.in = addr;
+                address->prefixlen = prefixlen;
+
+                address_drop(address, link, address_drop_handler);
         }
 
-        if (event == DHCP_EVENT_NO_LEASE)
-                log_debug_link(link, "IP address in use.");
+        if (link->network->dhcp_mtu) {
+                uint16_t mtu;
 
-        if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
-            event == DHCP_EVENT_STOP) {
-                if (link->network->dhcp_critical) {
-                        log_warning_link(link, "DHCPv4 connection considered system critical, "
-                                         "ignoring request to reconfigure it down.");
-                        return;
+                r = sd_dhcp_lease_get_mtu(link->dhcp_lease, &mtu);
+                if (r >= 0 && link->original_mtu != mtu) {
+                        r = link_set_mtu(link, link->original_mtu);
+                        if (r < 0) {
+                                log_warning_link(link, "DHCP error: could not reset MTU");
+                                link_enter_failed(link);
+                                return r;
+                        }
                 }
+        }
 
-                if (link->dhcp_address) {
-                        address_drop(link->dhcp_address, link, address_drop_handler);
+        if (link->network->dhcp_hostname) {
+                r = set_hostname(link->manager->bus, "");
+                if (r < 0)
+                        log_error("Failed to reset transient hostname");
+        }
 
-                        address_free(link->dhcp_address);
-                        link->dhcp_address = NULL;
-                }
+        link->dhcp_lease = sd_dhcp_lease_unref(link->dhcp_lease);
 
-                if (link->dhcp_route) {
-                        route_free(link->dhcp_route);
-                        link->dhcp_route = NULL;
-                }
+        return 0;
+}
 
-                if (link->network->dhcp_mtu) {
-                        uint16_t mtu;
+static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) {
+        sd_dhcp_lease *lease;
+        struct in_addr address;
+        struct in_addr netmask;
+        struct in_addr gateway;
+        unsigned prefixlen;
+        struct in_addr *nameservers;
+        size_t nameservers_size;
+        int r;
 
-                        r = sd_dhcp_client_get_mtu(client, &mtu);
-                        if (r >= 0 && link->original_mtu != mtu) {
-                                r = link_set_mtu(link, link->original_mtu);
-                                if (r < 0) {
-                                        log_warning_link(link, "DHCP error: could not reset MTU");
-                                        link_enter_failed(link);
-                                        return;
-                                }
-                        }
-                }
+        assert(client);
+        assert(link);
 
-                if (link->network->dhcp_hostname) {
-                        r = set_hostname(link->manager->bus, "");
-                        if (r < 0)
-                                log_error("Failed to reset transient hostname");
-                }
+        r = sd_dhcp_client_get_lease(client, &lease);
+        if (r < 0) {
+                log_warning_link(link, "DHCP error: no lease: %s",
+                                 strerror(-r));
+                return r;
         }
 
-        r = sd_dhcp_client_get_address(client, &address);
+        r = sd_dhcp_lease_get_address(lease, &address);
         if (r < 0) {
-                log_warning_link(link, "DHCP error: no address");
-                link_enter_failed(link);
-                return;
+                log_warning_link(link, "DHCP error: no address: %s",
+                                 strerror(-r));
+                return r;
         }
 
-        r = sd_dhcp_client_get_netmask(client, &netmask);
+        r = sd_dhcp_lease_get_netmask(lease, &netmask);
         if (r < 0) {
-                log_warning_link(link, "DHCP error: no netmask");
-                link_enter_failed(link);
-                return;
+                log_warning_link(link, "DHCP error: no netmask: %s",
+                                 strerror(-r));
+                return r;
         }
 
         prefixlen = net_netmask_to_prefixlen(&netmask);
 
-        r = sd_dhcp_client_get_router(client, &gateway);
+        r = sd_dhcp_lease_get_router(lease, &gateway);
         if (r < 0) {
-                log_warning_link(link, "DHCP error: no router");
-                link_enter_failed(link);
-                return;
+                log_warning_link(link, "DHCP error: no router: %s",
+                                 strerror(-r));
+                return r;
         }
 
-        if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_IP_ACQUIRE) {
-                _cleanup_address_free_ Address *addr = NULL;
-                _cleanup_route_free_ Route *rt = NULL;
-                struct in_addr *nameservers;
-                size_t nameservers_size;
-
-                log_struct_link(LOG_INFO, link,
-                                "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
-                                link->ifname,
-                                ADDRESS_FMT_VAL(address),
-                                prefixlen,
-                                ADDRESS_FMT_VAL(gateway),
-                                "ADDRESS=%u.%u.%u.%u",
-                                ADDRESS_FMT_VAL(address),
-                                "PREFIXLEN=%u",
-                                prefixlen,
-                                "GATEWAY=%u.%u.%u.%u",
-                                ADDRESS_FMT_VAL(gateway),
-                                NULL);
+        log_struct_link(LOG_INFO, link,
+                        "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
+                         link->ifname,
+                         ADDRESS_FMT_VAL(address),
+                         prefixlen,
+                         ADDRESS_FMT_VAL(gateway),
+                         "ADDRESS=%u.%u.%u.%u",
+                         ADDRESS_FMT_VAL(address),
+                         "PREFIXLEN=%u",
+                         prefixlen,
+                         "GATEWAY=%u.%u.%u.%u",
+                         ADDRESS_FMT_VAL(gateway),
+                         NULL);
+
+        link->dhcp_lease = lease;
+
+        if (link->network->dhcp_dns) {
+                r = sd_dhcp_lease_get_dns(lease, &nameservers, &nameservers_size);
+                if (r >= 0) {
+                        r = manager_update_resolv_conf(link->manager);
+                        if (r < 0)
+                                log_error("Failed to update resolv.conf");
+                }
+        }
 
-                r = address_new_dynamic(&addr);
-                if (r < 0) {
-                        log_error_link(link, "Could not allocate address");
-                        link_enter_failed(link);
-                        return;
+        if (link->network->dhcp_mtu) {
+                uint16_t mtu;
+
+                r = sd_dhcp_lease_get_mtu(lease, &mtu);
+                if (r >= 0) {
+                        r = link_set_mtu(link, mtu);
+                        if (r < 0)
+                                log_error_link(link, "Failed to set MTU "
+                                               "to %" PRIu16, mtu);
                 }
+        }
 
-                addr->family = AF_INET;
-                addr->in_addr.in = address;
-                addr->prefixlen = prefixlen;
-                addr->broadcast.s_addr = address.s_addr | ~netmask.s_addr;
+        if (link->network->dhcp_hostname) {
+                const char *hostname;
 
-                r = route_new_dynamic(&rt);
-                if (r < 0) {
-                        log_error_link(link, "Could not allocate route");
-                        link_enter_failed(link);
-                        return;
+                r = sd_dhcp_lease_get_hostname(lease, &hostname);
+                if (r >= 0) {
+                        r = set_hostname(link->manager->bus, hostname);
+                        if (r < 0)
+                                log_error("Failed to set transient hostname "
+                                          "to '%s'", hostname);
                 }
+        }
 
-                rt->family = AF_INET;
-                rt->in_addr.in = gateway;
+        link_enter_set_addresses(link);
 
-                link->dhcp_address = addr;
-                link->dhcp_route = rt;
-                addr = NULL;
-                rt = NULL;
+        return 0;
+}
 
-                if (link->network->dhcp_dns) {
-                        r = sd_dhcp_client_get_dns(client, &nameservers, &nameservers_size);
-                        if (r >= 0) {
-                                r = manager_update_resolv_conf(link->manager);
-                                if (r < 0)
-                                        log_error("Failed to update resolv.conf");
-                        }
-                }
+static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
+        Link *link = userdata;
+        int r;
 
-                if (link->network->dhcp_mtu) {
-                        uint16_t mtu;
-
-                        r = sd_dhcp_client_get_mtu(client, &mtu);
-                        if (r >= 0) {
-                                r = link_set_mtu(link, mtu);
-                                if (r < 0)
-                                        log_error_link(link, "Failed to set MTU "
-                                                             "to %" PRIu16, mtu);
+        assert(link);
+        assert(link->network);
+        assert(link->manager);
+
+        if (link->state == LINK_STATE_FAILED)
+                return;
+
+        switch (event) {
+                case DHCP_EVENT_NO_LEASE:
+                        log_debug_link(link, "IP address in use.");
+                        break;
+                case DHCP_EVENT_EXPIRED:
+                case DHCP_EVENT_STOP:
+                case DHCP_EVENT_IP_CHANGE:
+                        if (link->network->dhcp_critical) {
+                                log_error_link(link, "DHCPv4 connection considered system critical, "
+                                               "ignoring request to reconfigure it.");
+                                return;
                         }
-                }
 
-                if (link->network->dhcp_hostname) {
-                        const char *hostname;
+                        r = dhcp_lease_lost(link);
+                        if (r < 0) {
+                                link_enter_failed(link);
+                                return;
+                        }
 
-                        r = sd_dhcp_client_get_hostname(client, &hostname);
-                        if (r >= 0) {
-                                r = set_hostname(link->manager->bus, hostname);
-                                if (r < 0)
-                                        log_error("Failed to set transient hostname "
-                                                  "to '%s'", hostname);
+                        if (event == DHCP_EVENT_IP_CHANGE) {
+                                r = dhcp_lease_acquired(client, link);
+                                if (r < 0) {
+                                        link_enter_failed(link);
+                                        return;
+                                }
                         }
-                }
 
-                link_enter_set_addresses(link);
+                        break;
+                case DHCP_EVENT_IP_ACQUIRE:
+                        r = dhcp_lease_acquired(client, link);
+                        if (r < 0) {
+                                link_enter_failed(link);
+                                return;
+                        }
+                        break;
+                default:
+                        if (event < 0)
+                                log_warning_link(link, "DHCP error: %s", strerror(-event));
+                        else
+                                log_warning_link(link, "DHCP unknown event: %d", event);
+                        break;
         }
 
         return;
@@ -601,29 +668,29 @@ static int link_acquire_conf(Link *link) {
         assert(link->manager);
         assert(link->manager->event);
 
-        if (!link->dhcp) {
-                r = sd_dhcp_client_new(&link->dhcp);
+        if (!link->dhcp_client) {
+                r = sd_dhcp_client_new(&link->dhcp_client);
                 if (r < 0)
                         return r;
 
-                r = sd_dhcp_client_attach_event(link->dhcp, NULL, 0);
+                r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0);
                 if (r < 0)
                         return r;
 
-                r = sd_dhcp_client_set_index(link->dhcp, link->ifindex);
+                r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex);
                 if (r < 0)
                         return r;
 
-                r = sd_dhcp_client_set_mac(link->dhcp, &link->mac);
+                r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac);
                 if (r < 0)
                         return r;
 
-                r = sd_dhcp_client_set_callback(link->dhcp, dhcp_handler, link);
+                r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp_handler, link);
                 if (r < 0)
                         return r;
 
                 if (link->network->dhcp_mtu) {
-                        r = sd_dhcp_client_set_request_option(link->dhcp, 26);
+                        r = sd_dhcp_client_set_request_option(link->dhcp_client, 26);
                         if (r < 0)
                                 return r;
                 }
@@ -631,7 +698,7 @@ static int link_acquire_conf(Link *link) {
 
         log_debug_link(link, "acquiring DHCPv4 lease");
 
-        r = sd_dhcp_client_start(link->dhcp);
+        r = sd_dhcp_client_start(link->dhcp_client);
         if (r < 0)
                 return r;
 
@@ -672,7 +739,7 @@ static int link_update_flags(Link *link, unsigned flags) {
                         log_info_link(link, "carrier off");
 
                         if (link->network->dhcp) {
-                                r = sd_dhcp_client_stop(link->dhcp);
+                                r = sd_dhcp_client_stop(link->dhcp_client);
                                 if (r < 0) {
                                         log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r));
                                         link_enter_failed(link);
@@ -799,6 +866,8 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 }
 
 static int link_enter_enslave(Link *link) {
+        NetDev *vlan;
+        Iterator i;
         int r;
 
         assert(link);
@@ -807,7 +876,7 @@ static int link_enter_enslave(Link *link) {
 
         link->state = LINK_STATE_ENSLAVING;
 
-        if (!link->network->bridge && !link->network->bond && !link->network->vlan)
+        if (!link->network->bridge && !link->network->bond && !link->network->vlans)
                 return link_enslaved(link);
 
         if (link->network->bridge) {
@@ -831,20 +900,17 @@ static int link_enter_enslave(Link *link) {
                 link->enslaving ++;
         }
 
-        if (link->network->vlan) {
+        HASHMAP_FOREACH(vlan, link->network->vlans, i) {
                 log_struct_link(LOG_DEBUG, link,
                                 "MESSAGE=%s: enslaving by '%s'",
-                                link->ifname, link->network->vlan->name,
-                                NETDEV(link->network->vlan),
-                                NULL);
+                                link->ifname, vlan->name, NETDEV(vlan), NULL);
 
-                r = netdev_enslave(link->network->vlan, link, &enslave_handler);
+                r = netdev_enslave(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->ifname, vlan->name, strerror(-r),
+                                        NETDEV(vlan), NULL);
                         link_enter_failed(link);
                         return r;
                 }