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=aa59dd7cf44efb735ef07c5395f5bfc36b491994;hp=416eb5648335225622c44c02ee5a957f3bee4b49;hb=c6f7c917a1b494d4455800823472227463f87438;hpb=69629de9c820dd41fffb1bf9b69d6d5b319c19c9 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 416eb5648..aa59dd7cf 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -26,14 +26,12 @@ #include "libudev-private.h" #include "util.h" #include "bus-util.h" -#include "net-util.h" +#include "network-internal.h" #include "dhcp-lease-internal.h" int link_new(Manager *manager, struct udev_device *device, Link **ret) { _cleanup_link_free_ Link *link = NULL; - const char *mac; - struct ether_addr *mac_addr; const char *ifname; int r; @@ -53,17 +51,10 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) { if (link->ifindex <= 0) return -EINVAL; - r = asprintf(&link->state_file, "/run/systemd/network/links/%u", - (unsigned) link->ifindex); + r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64, + link->ifindex); if (r < 0) - return r; - - mac = udev_device_get_sysattr_value(device, "address"); - if (mac) { - mac_addr = ether_aton(mac); - if (mac_addr) - memcpy(&link->mac, mac_addr, sizeof(struct ether_addr)); - } + return -ENOMEM; ifname = udev_device_get_sysname(device); link->ifname = strdup(ifname); @@ -72,6 +63,8 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) { if (r < 0) return r; + link->udev_device = udev_device_ref(device); + *ret = link; link = NULL; @@ -94,6 +87,8 @@ void link_free(Link *link) { free(link->ifname); free(link->state_file); + udev_device_unref(link->udev_device); + free(link); } @@ -116,31 +111,6 @@ int link_get(Manager *m, int ifindex, Link **ret) { return 0; } -int link_add(Manager *m, struct udev_device *device, Link **ret) { - Link *link = NULL; - Network *network; - int r; - - assert(m); - assert(device); - - r = link_new(m, device, &link); - if (r < 0) - return r; - - *ret = link; - - r = network_get(m, device, &network); - if (r < 0) - return r == -ENOENT ? 0 : r; - - r = network_apply(m, network, link); - if (r < 0) - return r; - - return 0; -} - static int link_enter_configured(Link *link) { assert(link); assert(link->state == LINK_STATE_SETTING_ROUTES); @@ -262,6 +232,7 @@ static int link_enter_set_routes(Link *link) { if (link->dhcp_lease) { _cleanup_route_free_ Route *route = NULL; + _cleanup_route_free_ Route *route_gw = NULL; struct in_addr gateway; r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); @@ -278,6 +249,30 @@ static int link_enter_set_routes(Link *link) { return r; } + r = route_new_dynamic(&route_gw); + if (r < 0) { + log_error_link(link, "Could not allocate route: %s", + strerror(-r)); + return r; + } + + /* The dhcp netmask may mask out the gateway. Add an explicit + * route for the gw host so that we can route no matter the + * netmask or existing kernel route tables. */ + route_gw->family = AF_INET; + route_gw->dst_addr.in = gateway; + route_gw->dst_prefixlen = 32; + route_gw->scope = RT_SCOPE_LINK; + + r = route_configure(route_gw, link, &route_handler); + if (r < 0) { + log_warning_link(link, + "could not set host route: %s", strerror(-r)); + return r; + } + + link->route_messages ++; + route->family = AF_INET; route->in_addr.in = gateway; @@ -917,27 +912,7 @@ static int link_acquire_conf(Link *link) { assert(link->manager->event); if (link->network->ipv4ll) { - if (!link->ipv4ll) { - r = sd_ipv4ll_new(&link->ipv4ll); - if (r < 0) - return r; - - r = sd_ipv4ll_attach_event(link->ipv4ll, NULL, 0); - if (r < 0) - return r; - - r = sd_ipv4ll_set_index(link->ipv4ll, link->ifindex); - if (r < 0) - return r; - - r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac); - if (r < 0) - return r; - - r = sd_ipv4ll_set_callback(link->ipv4ll, ipv4ll_handler, link); - if (r < 0) - return r; - } + assert(link->ipv4ll); log_debug_link(link, "acquiring IPv4 link-local address"); @@ -947,33 +922,7 @@ static int link_acquire_conf(Link *link) { } if (link->network->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_client, NULL, 0); - if (r < 0) - return r; - - r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex); - if (r < 0) - return r; - - r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); - if (r < 0) - return r; - - 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_client, 26); - if (r < 0) - return r; - } - } + assert(link->dhcp_client); log_debug_link(link, "acquiring DHCPv4 lease"); @@ -994,10 +943,11 @@ static int link_update_flags(Link *link, unsigned flags) { if (link->state == LINK_STATE_FAILED) return 0; - if (link->flags == flags) { - log_debug_link(link, "link status unchanged: %#.8x", flags); + if (link->flags == flags) return 0; - } + + log_debug_link(link, "link status updated: %#.8x -> %#.8x", + link->flags, flags); if ((link->flags & IFF_UP) != (flags & IFF_UP)) log_info_link(link, @@ -1038,9 +988,6 @@ static int link_update_flags(Link *link, unsigned flags) { } } - log_debug_link(link, - "link status updated: %#.8x -> %#.8x", link->flags, flags); - link->flags = flags; return 0; @@ -1056,18 +1003,14 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { return 1; r = sd_rtnl_message_get_errno(m); - if (r < 0) { - log_struct_link(LOG_ERR, link, + if (r >= 0) + link_update_flags(link, link->flags | IFF_UP); + else + log_struct_link(LOG_WARNING, link, "MESSAGE=%s: could not bring up interface: %s", link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); - link_enter_failed(link); - return 1; - } - - link_update_flags(link, link->flags | IFF_UP); - return 1; } @@ -1275,8 +1218,6 @@ static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m, return 1; } - log_debug_link(link, "got link state"); - link_update(link, m); return 1; @@ -1310,70 +1251,159 @@ static int link_getlink(Link *link) { return 0; } -int link_configure(Link *link) { +static int link_configure(Link *link) { int r; assert(link); - assert(link->network); assert(link->state == _LINK_STATE_INVALID); r = link_getlink(link); - if (r < 0) { - link_enter_failed(link); + if (r < 0) return r; - } return link_enter_enslave(link); } +int link_add(Manager *m, struct udev_device *device, Link **ret) { + Link *link = NULL; + Network *network; + int r; + + assert(m); + assert(device); + + r = link_new(m, device, &link); + if (r < 0) + return r; + + *ret = link; + + r = network_get(m, device, &network); + if (r < 0) + return r == -ENOENT ? 0 : r; + + r = network_apply(m, network, link); + if (r < 0) + return r; + + if (link->network->ipv4ll) { + uint8_t seed[8]; + r = sd_ipv4ll_new(&link->ipv4ll); + if (r < 0) + return r; + + r = net_get_unique_predictable_data(link->udev_device, seed); + if (r >= 0) { + r = sd_ipv4ll_set_address_seed(link->ipv4ll, seed); + if (r < 0) + return r; + } + + r = sd_ipv4ll_attach_event(link->ipv4ll, NULL, 0); + if (r < 0) + return r; + + r = sd_ipv4ll_set_index(link->ipv4ll, link->ifindex); + if (r < 0) + return r; + + r = sd_ipv4ll_set_callback(link->ipv4ll, ipv4ll_handler, link); + if (r < 0) + return r; + } + + if (link->network->dhcp) { + r = sd_dhcp_client_new(&link->dhcp_client); + if (r < 0) + return r; + + r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0); + if (r < 0) + return r; + + r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex); + if (r < 0) + return r; + + 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_client, 26); + if (r < 0) + return r; + } + } + + r = link_configure(link); + if (r < 0) + return r; + + return 0; +} + int link_update(Link *link, sd_rtnl_message *m) { unsigned flags; - void *data; - uint16_t type; + struct ether_addr mac; 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_link(link, "Could not get link flags"); - return r; + if (link->network->dhcp && link->network->dhcp_mtu && + !link->original_mtu) { + r = sd_rtnl_message_read_u16(m, IFLA_MTU, &link->original_mtu); + if (r >= 0) + log_debug_link(link, "saved original MTU: %" + PRIu16, link->original_mtu); } - while (sd_rtnl_message_read(m, &type, &data) > 0) { - switch(type) { - case IFLA_MTU: - if (link->network->dhcp && link->network->dhcp_mtu && - !link->original_mtu) { - link->original_mtu = *(uint16_t *) data; - log_debug_link(link, "saved original MTU: %" - PRIu16, link->original_mtu); - } + r = sd_rtnl_message_read_ether_addr(m, IFLA_ADDRESS, &mac); + if (r >= 0 && memcmp(&link->mac.ether_addr_octet, &mac.ether_addr_octet, ETH_ALEN)) { - break; - case IFLA_ADDRESS: - if (memcmp(&link->mac.ether_addr_octet, &data, - ETH_ALEN)) { - memcpy(&link->mac, data, ETH_ALEN); - - log_debug_link(link, "updated MAC address: " - "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", - link->mac.ether_addr_octet[0], - link->mac.ether_addr_octet[1], - link->mac.ether_addr_octet[2], - link->mac.ether_addr_octet[3], - link->mac.ether_addr_octet[4], - link->mac.ether_addr_octet[5]); + memcpy(&link->mac.ether_addr_octet, &mac.ether_addr_octet, ETH_ALEN); + + log_debug_link(link, "MAC address: " + "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", + mac.ether_addr_octet[0], + mac.ether_addr_octet[1], + mac.ether_addr_octet[2], + mac.ether_addr_octet[3], + mac.ether_addr_octet[4], + mac.ether_addr_octet[5]); + + if (link->ipv4ll) { + r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac); + if (r < 0) { + log_warning_link(link, "Could not update MAC " + "address in IPv4LL client: %s", + strerror(-r)); + return r; } + } - break; + if (link->dhcp_client) { + r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); + if (r < 0) { + log_warning_link(link, "Could not update MAC " + "address in DHCP client: %s", + strerror(-r)); + return r; + } } } + r = sd_rtnl_message_link_get_flags(m, &flags); + if (r < 0) { + log_warning_link(link, "Could not get link flags"); + return r; + } + return link_update_flags(link, flags); } @@ -1385,10 +1415,6 @@ int link_save(Link *link) { assert(link); assert(link->state_file); - r = mkdir_safe_label("/run/systemd/network/links", 0755, 0, 0); - if (r < 0) - goto finish; - r = fopen_temporary(link->state_file, &f, &temp_path); if (r < 0) goto finish; @@ -1401,7 +1427,12 @@ int link_save(Link *link) { link_state_to_string(link->state)); if (link->dhcp_lease) { - const char *lease_file = "/run/systemd/network/leases/test.lease"; + char *lease_file; + + r = asprintf(&lease_file, "/run/systemd/network/leases/%"PRIu64, + link->ifindex); + if (r < 0) + return -ENOMEM; r = dhcp_lease_save(link->dhcp_lease, lease_file); if (r < 0)