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=7db71c0b70a97b0c5514529dccac86f90d4192af;hp=0947b0c905f1149c05840623a2ece3f19284a47e;hb=70b34f5de86809991d6753ba486b88481ceab817;hpb=3be1d7e0c5bf60658d34eb6311d4e77c6803578c diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 0947b0c90..7db71c0b7 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -42,11 +42,10 @@ static bool ipv4ll_is_bound(sd_ipv4ll *ll); static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { _cleanup_link_unref_ Link *link = NULL; uint16_t type; - char *ifname; + const char *ifname; int r, ifindex; assert(manager); - assert(manager->links); assert(message); assert(ret); @@ -82,17 +81,19 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { if (r < 0) log_debug_link(link, "MAC address not found for new device, continuing without"); - r = asprintf(&link->state_file, "/run/systemd/netif/links/%"PRIu64, - link->ifindex); + r = asprintf(&link->state_file, "/run/systemd/netif/links/%d", link->ifindex); if (r < 0) return -ENOMEM; - r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%"PRIu64, - link->ifindex); + r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%d", link->ifindex); if (r < 0) return -ENOMEM; - r = hashmap_put(manager->links, &link->ifindex, link); + r = hashmap_ensure_allocated(&manager->links, NULL, NULL); + if (r < 0) + return r; + + r = hashmap_put(manager->links, INT_TO_PTR(link->ifindex), link); if (r < 0) return r; @@ -129,7 +130,7 @@ static void link_free(Link *link) { sd_icmp6_nd_unref(link->icmp6_router_discovery); if (link->manager) - hashmap_remove(link->manager->links, &link->ifindex); + hashmap_remove(link->manager->links, INT_TO_PTR(link->ifindex)); free(link->ifname); @@ -157,15 +158,12 @@ Link *link_ref(Link *link) { int link_get(Manager *m, int ifindex, Link **ret) { Link *link; - uint64_t ifindex_64; assert(m); - assert(m->links); assert(ifindex); assert(ret); - ifindex_64 = ifindex; - link = hashmap_get(m->links, &ifindex_64); + link = hashmap_get(m->links, INT_TO_PTR(ifindex)); if (!link) return -ENODEV; @@ -401,23 +399,21 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { static int link_set_dhcp_routes(Link *link) { struct sd_dhcp_route *static_routes; - size_t static_routes_size; - int r; - unsigned i; + int r, n, i; assert(link); - r = sd_dhcp_lease_get_routes(link->dhcp_lease, &static_routes, &static_routes_size); - if (r < 0) { - if (r != -ENOENT) - log_warning_link(link, "DHCP error: could not get routes: %s", strerror(-r)); - return r; + n = sd_dhcp_lease_get_routes(link->dhcp_lease, &static_routes); + if (n < 0) { + if (n != -ENOENT) + log_warning_link(link, "DHCP error: could not get routes: %s", strerror(-n)); + return n; } - for (i = 0; i < static_routes_size; i++) { + for (i = 0; i < n; i++) { _cleanup_route_free_ Route *route = NULL; - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_DHCP); if (r < 0) { log_error_link(link, "Could not allocate route: %s", strerror(-r)); @@ -473,17 +469,9 @@ static int link_enter_set_routes(Link *link) { if (link->ipv4ll && !link->dhcp_lease) { _cleanup_route_free_ Route *route = NULL; - struct in_addr addr; - - r = sd_ipv4ll_get_address(link->ipv4ll, &addr); - if (r < 0 && r != -ENOENT) { - log_warning_link(link, "IPV4LL error: no address: %s", - strerror(-r)); - return r; - } if (r != -ENOENT) { - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_STATIC); if (r < 0) { log_error_link(link, "Could not allocate route: %s", strerror(-r)); @@ -519,14 +507,14 @@ static int link_enter_set_routes(Link *link) { } if (r >= 0) { - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_DHCP); if (r < 0) { log_error_link(link, "Could not allocate route: %s", strerror(-r)); return r; } - r = route_new_dynamic(&route_gw); + r = route_new_dynamic(&route_gw, RTPROT_DHCP); if (r < 0) { log_error_link(link, "Could not allocate route: %s", strerror(-r)); @@ -847,7 +835,9 @@ static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, r = sd_bus_message_get_errno(m); if (r < 0) - log_warning_link(link, "Could not set hostname: %s", strerror(-r)); + r = -r; + if (r > 0) + log_warning_link(link, "Could not set hostname: %s", strerror(r)); return 1; } @@ -955,7 +945,6 @@ static int dhcp_lease_lost(Link *link) { struct in_addr netmask; struct in_addr gateway; unsigned prefixlen; - unsigned i; int r; assert(link); @@ -965,14 +954,14 @@ static int dhcp_lease_lost(Link *link) { if (link->network->dhcp_routes) { struct sd_dhcp_route *routes; - size_t routes_size; + int n, i; - r = sd_dhcp_lease_get_routes(link->dhcp_lease, &routes, &routes_size); - if (r >= 0) { - for (i = 0; i < routes_size; i++) { + n = sd_dhcp_lease_get_routes(link->dhcp_lease, &routes); + if (n >= 0) { + for (i = 0; i < n; i++) { _cleanup_route_free_ Route *route = NULL; - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_UNSPEC); if (r >= 0) { route->family = AF_INET; route->in_addr.in = routes[i].gw_addr; @@ -992,7 +981,7 @@ static int dhcp_lease_lost(Link *link) { _cleanup_route_free_ Route *route_gw = NULL; _cleanup_route_free_ Route *route = NULL; - r = route_new_dynamic(&route_gw); + r = route_new_dynamic(&route_gw, RTPROT_UNSPEC); if (r >= 0) { route_gw->family = AF_INET; route_gw->dst_addr.in = gateway; @@ -1002,7 +991,7 @@ static int dhcp_lease_lost(Link *link) { route_drop(route_gw, link, &route_drop_handler); } - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_UNSPEC); if (r >= 0) { route->family = AF_INET; route->in_addr.in = gateway; @@ -1183,9 +1172,6 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { 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: @@ -1319,7 +1305,7 @@ static int ipv4ll_address_lost(Link *link) { address_drop(address, link, &address_drop_handler); - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_UNSPEC); if (r < 0) { log_error_link(link, "Could not allocate route: %s", strerror(-r)); @@ -1786,7 +1772,7 @@ static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata } static int link_enter_join_netdev(Link *link) { - NetDev *vlan, *macvlan, *vxlan; + NetDev *netdev; Iterator i; int r; @@ -1800,10 +1786,7 @@ static int link_enter_join_netdev(Link *link) { if (!link->network->bridge && !link->network->bond && - !link->network->tunnel && - hashmap_isempty(link->network->vlans) && - hashmap_isempty(link->network->macvlans) && - hashmap_isempty(link->network->vxlans)) + hashmap_isempty(link->network->stacked_netdevs)) return link_joined(link); if (link->network->bond) { @@ -1811,7 +1794,7 @@ static int link_enter_join_netdev(Link *link) { "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, link->network->bond->ifname, - NETDEV(link->network->bond), + NETDEVIF(link->network->bond), NULL); r = netdev_join(link->network->bond, link, &netdev_join_handler); @@ -1820,7 +1803,7 @@ static int link_enter_join_netdev(Link *link) { "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, link->network->bond->ifname, strerror(-r), - NETDEV(link->network->bond), + NETDEVIF(link->network->bond), NULL); link_enter_failed(link); return r; @@ -1834,7 +1817,7 @@ static int link_enter_join_netdev(Link *link) { "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, link->network->bridge->ifname, - NETDEV(link->network->bridge), + NETDEVIF(link->network->bridge), NULL); r = netdev_join(link->network->bridge, link, &netdev_join_handler); @@ -1843,30 +1826,7 @@ static int link_enter_join_netdev(Link *link) { "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, link->network->bridge->ifname, strerror(-r), - NETDEV(link->network->bridge), - NULL); - link_enter_failed(link); - return r; - } - - link->enslaving ++; - } - - if (link->network->tunnel) { - log_struct_link(LOG_DEBUG, link, - "MESSAGE=%-*s: enslaving by '%s'", - IFNAMSIZ, - link->ifname, link->network->tunnel->ifname, - NETDEV(link->network->tunnel), - NULL); - - r = netdev_join(link->network->tunnel, link, &netdev_join_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not join netdev '%s': %s", - IFNAMSIZ, - link->ifname, link->network->tunnel->ifname, strerror(-r), - NETDEV(link->network->tunnel), + NETDEVIF(link->network->bridge), NULL); link_enter_failed(link); return r; @@ -1875,59 +1835,19 @@ static int link_enter_join_netdev(Link *link) { link->enslaving ++; } - HASHMAP_FOREACH(vlan, link->network->vlans, i) { + HASHMAP_FOREACH(netdev, link->network->stacked_netdevs, i) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, - link->ifname, vlan->ifname, NETDEV(vlan), NULL); + link->ifname, netdev->ifname, NETDEVIF(netdev), NULL); - r = netdev_join(vlan, link, &netdev_join_handler); + r = netdev_join(netdev, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, - link->ifname, vlan->ifname, strerror(-r), - NETDEV(vlan), NULL); - link_enter_failed(link); - return r; - } - - link->enslaving ++; - } - - HASHMAP_FOREACH(macvlan, link->network->macvlans, i) { - log_struct_link(LOG_DEBUG, link, - "MESSAGE=%-*s: enslaving by '%s'", - IFNAMSIZ, - link->ifname, macvlan->ifname, NETDEV(macvlan), NULL); - - r = netdev_join(macvlan, link, &netdev_join_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not join netdev '%s': %s", - IFNAMSIZ, - link->ifname, macvlan->ifname, strerror(-r), - NETDEV(macvlan), NULL); - link_enter_failed(link); - return r; - } - - link->enslaving ++; - } - - HASHMAP_FOREACH(vxlan, link->network->vxlans, i) { - log_struct_link(LOG_DEBUG, link, - "MESSAGE=%*s: enslaving by '%s'", - IFNAMSIZ, - link->ifname, vxlan->ifname, NETDEV(vxlan), NULL); - - r = netdev_join(vxlan, link, &netdev_join_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not join netdev '%s': %s", - IFNAMSIZ, - link->ifname, vxlan->ifname, strerror(-r), - NETDEV(vxlan), NULL); + link->ifname, netdev->ifname, strerror(-r), + NETDEVIF(netdev), NULL); link_enter_failed(link); return r; } @@ -1998,6 +1918,10 @@ static int link_configure(Link *link) { if (r < 0) return r; + r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link->network->dhcp_broadcast); + if (r < 0) + return r; + if (link->network->dhcp_mtu) { r = sd_dhcp_client_set_request_option(link->dhcp_client, 26); if (r < 0) @@ -2122,6 +2046,9 @@ int link_initialized(Link *link, struct udev_device *device) { if (link->state != LINK_STATE_INITIALIZING) return 0; + if (link->udev_device) + return 0; + log_debug_link(link, "udev initialized link"); link->udev_device = udev_device_ref(device); @@ -2289,7 +2216,7 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { link = *ret; - log_debug_link(link, "link %"PRIu64" added", link->ifindex); + log_debug_link(link, "link %d added", link->ifindex); r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, link->ifindex, 0); if (r < 0) @@ -2303,7 +2230,7 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { if (detect_container(NULL) <= 0) { /* not in a container, udev will be around */ - sprintf(ifindex_str, "n%"PRIu64, link->ifindex); + sprintf(ifindex_str, "n%d", link->ifindex); device = udev_device_new_from_device_id(m->udev, ifindex_str); if (!device) { log_warning_link(link, "could not find udev device"); @@ -2333,7 +2260,7 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { int link_update(Link *link, sd_rtnl_message *m) { struct ether_addr mac; - char *ifname; + const char *ifname; int r; assert(link); @@ -2415,27 +2342,6 @@ int link_update(Link *link, sd_rtnl_message *m) { return link_update_flags(link, m); } -static void serialize_addresses(FILE *f, const char *key, Address *address) { - Address *ad; - - assert(f); - assert(key); - - if (!address) - return; - - fprintf(f, "%s=", key); - - LIST_FOREACH(addresses, ad, address) { - char buf[INET6_ADDRSTRLEN]; - - if (inet_ntop(ad->family, &ad->in_addr, buf, INET6_ADDRSTRLEN)) - fprintf(f, "%s%s", buf, (ad->addresses_next) ? " ": ""); - } - - fputs("\n", f); -} - static void link_update_operstate(Link *link) { assert(link); @@ -2502,13 +2408,51 @@ int link_save(Link *link) { fprintf(f, "# This is private data. Do not parse.\n" "ADMIN_STATE=%s\n" - "OPER_STATE=%s\n" - "FLAGS=%u\n", - admin_state, oper_state, link->flags); + "OPER_STATE=%s\n", + admin_state, oper_state); if (link->network) { - serialize_addresses(f, "DNS", link->network->dns); - serialize_addresses(f, "NTP", link->network->ntp); + char **address; + + fputs("DNS=", f); + + if (link->network->dhcp_dns && + link->dhcp_lease) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_dns(link->dhcp_lease, &addresses); + if (r > 0) { + serialize_in_addrs(f, addresses, r); + if (link->network->dns) + fputs(" ", f); + } + } + + STRV_FOREACH(address, link->network->dns) + fprintf(f, "%s%s", *address, + (address + 1 ? " " : "")); + + fputs("\n", f); + + fprintf(f, "NTP="); + + if (link->network->dhcp_ntp && + link->dhcp_lease) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_ntp(link->dhcp_lease, &addresses); + if (r > 0) { + serialize_in_addrs(f, addresses, r); + if (link->network->ntp) + fputs(" ", f); + } + } + + STRV_FOREACH(address, link->network->ntp) + fprintf(f, "%s%s", *address, + (address + 1 ? " " : "")); + + fputs("\n", f); } if (link->dhcp_lease) { @@ -2519,12 +2463,8 @@ int link_save(Link *link) { goto finish; fprintf(f, - "DHCP_LEASE=%s\n" - "DHCP_USE_DNS=%s\n" - "DHCP_USE_NTP=%s\n", - link->lease_file, - yes_no(link->network->dhcp_dns), - yes_no(link->network->dhcp_ntp)); + "DHCP_LEASE=%s\n", + link->lease_file); } else unlink(link->lease_file);