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=d81a3bf630ff33b8eee02a66eb8fe8d1f3a6e956;hp=04a2f8ccbe2c151db0ab3ae7e9972bd524e713fc;hb=059f6c42b744a18d0deec0c79a9e0730ec6c1c76;hpb=e375dcde7202d5df4e29f5258e0f8c2bcea4535c diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 04a2f8ccb..d81a3bf63 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -75,12 +75,16 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { if (!link->ifname) return -ENOMEM; - r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64, + r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac); + if (r < 0) + return r; + + r = asprintf(&link->state_file, "/run/systemd/netif/links/%"PRIu64, link->ifindex); if (r < 0) return -ENOMEM; - r = asprintf(&link->lease_file, "/run/systemd/network/leases/%"PRIu64, + r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%"PRIu64, link->ifindex); if (r < 0) return -ENOMEM; @@ -174,19 +178,6 @@ void link_drop(Link *link) { return; } -static int link_enter_configured(Link *link) { - assert(link); - assert(link->state == LINK_STATE_SETTING_ROUTES); - - log_info_link(link, "link configured"); - - link->state = LINK_STATE_CONFIGURED; - - link_save(link); - - return 0; -} - static void link_enter_unmanaged(Link *link) { assert(link); @@ -227,6 +218,16 @@ static int link_stop_clients(Link *link) { } } + if (link->network->dhcp_server) { + assert(link->dhcp_server); + + k = sd_dhcp_server_stop(link->dhcp_server); + if (k < 0) { + log_warning_link(link, "Could not stop DHCPv4 server: %s", strerror(-r)); + r = k; + } + } + return r; } @@ -245,6 +246,37 @@ static void link_enter_failed(Link *link) { link_save(link); } +static int link_enter_configured(Link *link) { + int r; + + assert(link); + assert(link->network); + assert(link->state == LINK_STATE_SETTING_ROUTES); + + + if (link->network->dhcp_server) { + log_debug_link(link, "offering DHCPv4 leases"); + + r = sd_dhcp_server_start(link->dhcp_server); + if (r < 0) { + log_warning_link(link, "could not start DHCPv4 server " + "instance: %s", strerror(-r)); + + link_enter_failed(link); + + return 0; + } + } + + log_info_link(link, "link configured"); + + link->state = LINK_STATE_CONFIGURED; + + link_save(link); + + return 0; +} + static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { Link *link = userdata; int r; @@ -264,7 +296,7 @@ static int route_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_WARNING, link, - "MESSAGE=%*s: could not set route: %s", + "MESSAGE=%-*s: could not set route: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, @@ -430,7 +462,7 @@ static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -ESRCH) log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not drop route: %s", + "MESSAGE=%-*s: could not drop route: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, @@ -462,7 +494,7 @@ static int address_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_WARNING, link, - "MESSAGE=%*s: could not set address: %s", + "MESSAGE=%-*s: could not set address: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, @@ -609,7 +641,7 @@ static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userd r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -ENOENT) log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not update address: %s", + "MESSAGE=%-*s: could not update address: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, @@ -636,7 +668,7 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EADDRNOTAVAIL) log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not drop address: %s", + "MESSAGE=%-*s: could not drop address: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, @@ -721,8 +753,8 @@ static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0) log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not set MTU: %s", - link->ifname, strerror(-r), + "MESSAGE=%-*s: could not set MTU: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); @@ -890,7 +922,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { if (r >= 0) log_struct_link(LOG_INFO, link, - "MESSAGE=%*s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u", + "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u", IFNAMSIZ, link->ifname, ADDRESS_FMT_VAL(address), @@ -905,7 +937,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { NULL); else log_struct_link(LOG_INFO, link, - "MESSAGE=%*s: DHCPv4 address %u.%u.%u.%u/%u", + "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u", IFNAMSIZ, link->ifname, ADDRESS_FMT_VAL(address), @@ -1132,7 +1164,7 @@ static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) { return r; log_struct_link(LOG_INFO, link, - "MESSAGE=%*s: IPv4 link-local address %u.%u.%u.%u", + "MESSAGE=%-*s: IPv4 link-local address %u.%u.%u.%u", IFNAMSIZ, link->ifname, ADDRESS_FMT_VAL(address), @@ -1352,7 +1384,7 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { /* we warn but don't fail the link, as it may be brought up later */ log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not bring up interface: %s", + "MESSAGE=%-*s: could not bring up interface: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, @@ -1439,7 +1471,7 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0) { log_struct_link(LOG_ERR, link, - "MESSAGE=%*s: could not enslave: %s", + "MESSAGE=%-*s: could not enslave: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, @@ -1460,7 +1492,7 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { } static int link_enter_enslave(Link *link) { - NetDev *vlan, *macvlan; + NetDev *vlan, *macvlan, *vxlan; Iterator i; int r; @@ -1476,12 +1508,13 @@ static int link_enter_enslave(Link *link) { !link->network->bond && !link->network->tunnel && hashmap_isempty(link->network->vlans) && - hashmap_isempty(link->network->macvlans)) + hashmap_isempty(link->network->macvlans) && + hashmap_isempty(link->network->vxlans)) return link_enslaved(link); if (link->network->bond) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%*s: enslaving by '%s'", + "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, link->network->bond->ifname, NETDEV(link->network->bond), @@ -1490,7 +1523,7 @@ static int link_enter_enslave(Link *link) { r = netdev_enslave(link->network->bond, link, &enslave_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not enslave by '%s': %s", IFNAMSIZ, link->ifname, link->network->bond->ifname, strerror(-r), NETDEV(link->network->bond), @@ -1505,7 +1538,7 @@ static int link_enter_enslave(Link *link) { if (link->network->bridge) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%*s: enslaving by '%s'", + "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, link->network->bridge->ifname, NETDEV(link->network->bridge), @@ -1514,7 +1547,7 @@ static int link_enter_enslave(Link *link) { r = netdev_enslave(link->network->bridge, link, &enslave_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not enslave by '%s': %s", IFNAMSIZ, link->ifname, link->network->bridge->ifname, strerror(-r), NETDEV(link->network->bridge), @@ -1529,7 +1562,7 @@ static int link_enter_enslave(Link *link) { if (link->network->tunnel) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%*s: enslaving by '%s'", + "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, link->network->tunnel->ifname, NETDEV(link->network->tunnel), @@ -1538,7 +1571,7 @@ static int link_enter_enslave(Link *link) { r = netdev_enslave(link->network->tunnel, link, &enslave_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not enslave by '%s': %s", IFNAMSIZ, link->ifname, link->network->tunnel->ifname, strerror(-r), NETDEV(link->network->tunnel), @@ -1553,14 +1586,14 @@ static int link_enter_enslave(Link *link) { HASHMAP_FOREACH(vlan, link->network->vlans, i) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%*s: enslaving by '%s'", + "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, vlan->ifname, NETDEV(vlan), NULL); r = netdev_enslave(vlan, link, &enslave_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not enslave by '%s': %s", IFNAMSIZ, link->ifname, vlan->ifname, strerror(-r), NETDEV(vlan), NULL); @@ -1574,14 +1607,14 @@ static int link_enter_enslave(Link *link) { HASHMAP_FOREACH(macvlan, link->network->macvlans, i) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%*s: enslaving by '%s'", + "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, macvlan->ifname, NETDEV(macvlan), NULL); r = netdev_enslave(macvlan, link, &enslave_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not enslave by '%s': %s", IFNAMSIZ, link->ifname, macvlan->ifname, strerror(-r), NETDEV(macvlan), NULL); @@ -1593,6 +1626,27 @@ static int link_enter_enslave(Link *link) { 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_enslave(vxlan, link, &enslave_handler); + if (r < 0) { + log_struct_link(LOG_WARNING, link, + "MESSAGE=%*s: could not enslave by '%s': %s", + IFNAMSIZ, + link->ifname, vxlan->ifname, strerror(-r), + NETDEV(vxlan), NULL); + link_enter_failed(link); + return r; + } + + link_ref(link); + link->enslaving ++; + } + return 0; } @@ -1663,6 +1717,53 @@ static int link_configure(Link *link) { } } + if (link->network->dhcp_server) { + Address *address; + + r = sd_dhcp_server_new(&link->dhcp_server, link->ifindex); + if (r < 0) + return r; + + r = sd_dhcp_server_attach_event(link->dhcp_server, NULL, 0); + if (r < 0) + return r; + + LIST_FOREACH(addresses, address, + link->network->static_addresses) { + struct in_addr pool_start; + + if (address->family != AF_INET) + continue; + + /* currently this is picked essentially at random */ + r = sd_dhcp_server_set_address(link->dhcp_server, + &address->in_addr.in); + if (r < 0) + return r; + + /* offer 32 addresses starting from the address following the server address */ + pool_start.s_addr = htobe32(be32toh(address->in_addr.in.s_addr) + 1); + r = sd_dhcp_server_set_lease_pool(link->dhcp_server, + &pool_start, 32); + if (r < 0) + return r; + + break; + } + + /* TODO: + r = sd_dhcp_server_set_router(link->dhcp_server, + &main_address->in_addr.in); + if (r < 0) + return r; + + r = sd_dhcp_server_set_prefixlen(link->dhcp_server, + main_address->prefixlen); + if (r < 0) + return r; + */ + } + if (link_has_carrier(link->flags, link->kernel_operstate)) { r = link_acquire_conf(link); if (r < 0) @@ -1672,7 +1773,8 @@ static int link_configure(Link *link) { return link_enter_enslave(link); } -int link_initialized(Link *link, struct udev_device *device) { +static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { + Link *link = userdata; Network *network; int r; @@ -1683,12 +1785,9 @@ int link_initialized(Link *link, struct udev_device *device) { if (link->state != LINK_STATE_INITIALIZING) return 0; - if (device) - link->udev_device = udev_device_ref(device); + log_debug_link(link, "link state is up-to-date"); - log_debug_link(link, "udev initialized link"); - - r = network_get(link->manager, device, link->ifname, &link->mac, &network); + r = network_get(link->manager, link->udev_device, link->ifname, &link->mac, &network); if (r == -ENOENT) { link_enter_unmanaged(link); return 0; @@ -1706,6 +1805,38 @@ int link_initialized(Link *link, struct udev_device *device) { return 0; } +int link_initialized(Link *link, struct udev_device *device) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; + int r; + + assert(link); + assert(link->manager); + assert(link->manager->rtnl); + assert(device); + + if (link->state != LINK_STATE_INITIALIZING) + return 0; + + log_debug_link(link, "udev initialized link"); + + link->udev_device = udev_device_ref(device); + + /* udev has initialized the link, but we don't know if we have yet processed + the NEWLINK messages with the latest state. Do a GETLINK, when it returns + we know that the pending NEWLINKs have already been processed and that we + are up-to-date */ + + r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_GETLINK, link->ifindex); + if (r < 0) + return r; + + r = sd_rtnl_call_async(link->manager->rtnl, req, link_initialized_and_synced, link, 0, NULL); + if (r < 0) + return r; + + return 0; +} + int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { Manager *m = userdata; Link *link = NULL; @@ -1809,12 +1940,17 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use LIST_PREPEND(addresses, link->addresses, address); address = NULL; + link_save(link); + break; case RTM_DELADDR: - if (address_dropped) + if (address_dropped) { log_debug_link(link, "removed address: %s/%u", buf, address->prefixlen); + link_save(link); + } + break; default: assert_not_reached("Received invalid RTNL message type"); @@ -1888,11 +2024,15 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { log_debug_link(link, "udev initializing link..."); return 0; } - } - r = link_initialized(link, device); - if (r < 0) - return r; + r = link_initialized(link, device); + if (r < 0) + return r; + } else { + r = link_initialized_and_synced(m->rtnl, NULL, link); + if (r < 0) + return r; + } return 0; } @@ -2068,6 +2208,8 @@ int link_save(Link *link) { } if (link->dhcp_lease) { + assert(link->network); + r = dhcp_lease_save(link->dhcp_lease, link->lease_file); if (r < 0) goto finish;