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=5eeeb3d29ebc21dc47f454cf266731829f5ee7b1;hp=a523a3e9b2d7f47f16785e9ef8b3a46d7d671fd0;hb=ae06ab1014641feb83ffd0d08f0957e69bbbae08;hpb=856f962c7a2e13b33f5b1c691efb2780f2c7afc3 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index a523a3e9b..5eeeb3d29 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -21,8 +21,10 @@ #include #include +#include #include "networkd.h" +#include "networkd-netdev.h" #include "libudev-private.h" #include "udev-util.h" #include "util.h" @@ -40,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); @@ -80,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; @@ -127,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); @@ -155,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; @@ -399,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)); @@ -426,7 +424,7 @@ static int link_set_dhcp_routes(Link *link) { route->in_addr.in = static_routes[i].gw_addr; route->dst_addr.in = static_routes[i].dst_addr; route->dst_prefixlen = static_routes[i].dst_prefixlen; - route->metrics = DHCP_STATIC_ROUTE_METRIC; + route->metrics = DHCP_ROUTE_METRIC; r = route_configure(route, link, &route_handler); if (r < 0) { @@ -435,7 +433,6 @@ static int link_set_dhcp_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; } @@ -467,23 +464,14 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; } 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)); @@ -492,7 +480,7 @@ static int link_enter_set_routes(Link *link) { route->family = AF_INET; route->scope = RT_SCOPE_LINK; - route->metrics = 99; + route->metrics = IPV4LL_ROUTE_METRIC; r = route_configure(route, link, &route_handler); if (r < 0) { @@ -502,7 +490,6 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; } } @@ -520,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)); @@ -541,7 +528,7 @@ static int link_enter_set_routes(Link *link) { route_gw->dst_addr.in = gateway; route_gw->dst_prefixlen = 32; route_gw->scope = RT_SCOPE_LINK; - route_gw->metrics = DHCP_STATIC_ROUTE_METRIC; + route_gw->metrics = DHCP_ROUTE_METRIC; r = route_configure(route_gw, link, &route_handler); if (r < 0) { @@ -550,12 +537,11 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; route->family = AF_INET; route->in_addr.in = gateway; - route->metrics = DHCP_STATIC_ROUTE_METRIC; + route->metrics = DHCP_ROUTE_METRIC; r = route_configure(route, link, &route_handler); if (r < 0) { @@ -565,7 +551,6 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; } @@ -600,13 +585,38 @@ static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) "ERRNO=%d", -r, NULL); - return 0; + return 1; +} + +static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { + _cleanup_link_unref_ Link *link = userdata; + int r; + + assert(rtnl); + assert(m); + assert(link); + assert(link->manager); + + for (; m; m = sd_rtnl_message_next(m)) { + r = sd_rtnl_message_get_errno(m); + if (r < 0) { + log_debug_link(link, "getting address failed: %s", strerror(-r)); + continue; + } + + r = link_rtnl_process_address(rtnl, m, link->manager); + if (r < 0) + log_warning_link(link, "could not process address: %s", strerror(-r)); + } + + return 1; } static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { _cleanup_link_unref_ Link *link = userdata; int r; + assert(rtnl); assert(m); assert(link); assert(link->ifname); @@ -627,6 +637,11 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); + else if (r >= 0) { + /* calling handler directly so take a ref */ + link_ref(link); + link_get_address_handler(rtnl, m, link); + } if (link->addr_messages == 0) { log_debug_link(link, "addresses set"); @@ -662,7 +677,6 @@ static int link_enter_set_addresses(Link *link) { return r; } - link_ref(link); link->addr_messages ++; } @@ -698,7 +712,6 @@ static int link_enter_set_addresses(Link *link) { return r; } - link_ref(link); link->addr_messages ++; } } @@ -759,7 +772,6 @@ static int link_enter_set_addresses(Link *link) { return r; } - link_ref(link); link->addr_messages ++; } @@ -786,7 +798,7 @@ static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userd "ERRNO=%d", -r, NULL); - return 0; + return 1; } static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { @@ -809,7 +821,7 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat "ERRNO=%d", -r, NULL); - return 0; + return 1; } static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { @@ -931,7 +943,6 @@ static int dhcp_lease_lost(Link *link) { struct in_addr netmask; struct in_addr gateway; unsigned prefixlen; - unsigned i; int r; assert(link); @@ -941,14 +952,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; @@ -956,7 +967,6 @@ static int dhcp_lease_lost(Link *link) { route->dst_prefixlen = routes[i].dst_prefixlen; route_drop(route, link, &route_drop_handler); - link_ref(link); } } } @@ -969,7 +979,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; @@ -977,16 +987,14 @@ static int dhcp_lease_lost(Link *link) { route_gw->scope = RT_SCOPE_LINK; route_drop(route_gw, link, &route_drop_handler); - link_ref(link); } - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_UNSPEC); if (r >= 0) { route->family = AF_INET; route->in_addr.in = gateway; route_drop(route, link, &route_drop_handler); - link_ref(link); } } @@ -999,7 +1007,6 @@ static int dhcp_lease_lost(Link *link) { address->prefixlen = prefixlen; address_drop(address, link, &address_drop_handler); - link_ref(link); } if (link->network->dhcp_mtu) { @@ -1163,9 +1170,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: @@ -1266,7 +1270,6 @@ static int ipv4ll_address_update(Link *link, bool deprecate) { address->broadcast.s_addr = address->in_addr.in.s_addr | htonl(0xfffffffflu >> address->prefixlen); address_update(address, link, &address_update_handler); - link_ref(link); } return 0; @@ -1299,9 +1302,8 @@ static int ipv4ll_address_lost(Link *link) { address->scope = RT_SCOPE_LINK; address_drop(address, link, &address_drop_handler); - link_ref(link); - 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)); @@ -1313,7 +1315,6 @@ static int ipv4ll_address_lost(Link *link) { route->metrics = 99; route_drop(route, link, &route_drop_handler); - link_ref(link); } return 0; @@ -1716,14 +1717,14 @@ static int link_up(Link *link) { return 0; } -static int link_enslaved(Link *link) { +static int link_joined(Link *link) { int r; assert(link); assert(link->state == LINK_STATE_ENSLAVING); assert(link->network); - log_debug_link(link, "enslaved"); + log_debug_link(link, "joined netdev"); if (!(link->flags & IFF_UP)) { r = link_up(link); @@ -1736,7 +1737,7 @@ static int link_enslaved(Link *link) { return link_enter_set_addresses(link); } -static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { +static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { _cleanup_link_unref_ Link *link = userdata; int r; @@ -1753,7 +1754,7 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) { log_struct_link(LOG_ERR, link, - "MESSAGE=%-*s: could not enslave: %s", + "MESSAGE=%-*s: could not join netdev: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, @@ -1763,12 +1764,12 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { } if (link->enslaving <= 0) - link_enslaved(link); + link_joined(link); return 1; } -static int link_enter_enslave(Link *link) { +static int link_enter_join_netdev(Link *link) { NetDev *vlan, *macvlan, *vxlan; Iterator i; int r; @@ -1787,29 +1788,28 @@ static int link_enter_enslave(Link *link) { hashmap_isempty(link->network->vlans) && hashmap_isempty(link->network->macvlans) && hashmap_isempty(link->network->vxlans)) - return link_enslaved(link); + return link_joined(link); if (link->network->bond) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, link->network->bond->ifname, - NETDEV(link->network->bond), + NETDEVIF(link->network->bond), NULL); - r = netdev_enslave(link->network->bond, link, &enslave_handler); + r = netdev_join(link->network->bond, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + "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; } - link_ref(link); link->enslaving ++; } @@ -1818,22 +1818,21 @@ static int link_enter_enslave(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_enslave(link->network->bridge, link, &enslave_handler); + r = netdev_join(link->network->bridge, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, link->network->bridge->ifname, strerror(-r), - NETDEV(link->network->bridge), + NETDEVIF(link->network->bridge), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } @@ -1842,22 +1841,21 @@ static int link_enter_enslave(Link *link) { "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, link->network->tunnel->ifname, - NETDEV(link->network->tunnel), + NETDEVIF(link->network->tunnel), NULL); - r = netdev_enslave(link->network->tunnel, link, &enslave_handler); + r = netdev_join(link->network->tunnel, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, link->network->tunnel->ifname, strerror(-r), - NETDEV(link->network->tunnel), + NETDEVIF(link->network->tunnel), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } @@ -1865,20 +1863,19 @@ static int link_enter_enslave(Link *link) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, - link->ifname, vlan->ifname, NETDEV(vlan), NULL); + link->ifname, vlan->ifname, NETDEVIF(vlan), NULL); - r = netdev_enslave(vlan, link, &enslave_handler); + r = netdev_join(vlan, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, vlan->ifname, strerror(-r), - NETDEV(vlan), NULL); + NETDEVIF(vlan), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } @@ -1886,20 +1883,19 @@ static int link_enter_enslave(Link *link) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, - link->ifname, macvlan->ifname, NETDEV(macvlan), NULL); + link->ifname, macvlan->ifname, NETDEVIF(macvlan), NULL); - r = netdev_enslave(macvlan, link, &enslave_handler); + r = netdev_join(macvlan, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, macvlan->ifname, strerror(-r), - NETDEV(macvlan), NULL); + NETDEVIF(macvlan), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } @@ -1907,20 +1903,19 @@ static int link_enter_enslave(Link *link) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%*s: enslaving by '%s'", IFNAMSIZ, - link->ifname, vxlan->ifname, NETDEV(vxlan), NULL); + link->ifname, vxlan->ifname, NETDEVIF(vxlan), NULL); - r = netdev_enslave(vxlan, link, &enslave_handler); + r = netdev_join(vxlan, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not enslave by '%s': %s", + "MESSAGE=%*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, vxlan->ifname, strerror(-r), - NETDEV(vxlan), NULL); + NETDEVIF(vxlan), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } @@ -1987,11 +1982,16 @@ 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) return r; } + if (link->network->dhcp_routes) { r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_STATIC_ROUTE); if (r < 0) @@ -2000,6 +2000,25 @@ static int link_configure(Link *link) { if (r < 0) return r; } + + if (link->network->dhcp_sendhost) { + _cleanup_free_ char *hostname = gethostname_malloc(); + if (!hostname) + return -ENOMEM; + + if (!is_localhost(hostname)) { + r = sd_dhcp_client_set_hostname(link->dhcp_client, hostname); + if (r < 0) + return r; + } + } + + if (link->network->dhcp_vendor_class_identifier) { + r = sd_dhcp_client_set_vendor_class_identifier(link->dhcp_client, + link->network->dhcp_vendor_class_identifier); + if (r < 0) + return r; + } } if (link->network->dhcp_server) { @@ -2044,7 +2063,7 @@ static int link_configure(Link *link) { return r; } - return link_enter_enslave(link); + return link_enter_join_netdev(link); } static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { @@ -2091,6 +2110,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); @@ -2147,7 +2169,7 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use r = address_new_dynamic(&address); if (r < 0) - return 0; + return r; r = sd_rtnl_message_addr_get_family(message, &address->family); if (r < 0 || !IN_SET(address->family, AF_INET, AF_INET6)) { @@ -2211,7 +2233,10 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use case RTM_NEWADDR: if (!address_dropped) log_debug_link(link, "added address: %s/%u", buf, - address->prefixlen); + address->prefixlen); + else + log_debug_link(link, "updated address: %s/%u", buf, + address->prefixlen); LIST_PREPEND(addresses, link->addresses, address); address = NULL; @@ -2222,10 +2247,12 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use case RTM_DELADDR: if (address_dropped) { log_debug_link(link, "removed address: %s/%u", buf, - address->prefixlen); + address->prefixlen); link_save(link); - } + } else + log_warning_link(link, "removing non-existent address: %s/%u", + buf, address->prefixlen); break; default: @@ -2235,30 +2262,6 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use return 1; } -static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - _cleanup_link_unref_ Link *link = userdata; - int r; - - assert(rtnl); - assert(m); - assert(link); - assert(link->manager); - - for (; m; m = sd_rtnl_message_next(m)) { - r = sd_rtnl_message_get_errno(m); - if (r < 0) { - log_debug_link(link, "getting address failed: %s", strerror(-r)); - continue; - } - - r = link_rtnl_process_address(rtnl, m, link->manager); - if (r < 0) - log_warning_link(link, "could not process address: %s", strerror(-r)); - } - - return 1; -} - int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { Link *link; _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; @@ -2277,7 +2280,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) @@ -2291,7 +2294,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"); @@ -2321,7 +2324,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); @@ -2403,27 +2406,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); @@ -2490,13 +2472,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) { @@ -2507,12 +2527,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);