X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=63c7a8bf248195f1aad1dd7298a7d6464925a4c7;hb=de45d726034f33afdb0a185e62fc61bf10a0acd2;hp=b9f1b992d31e71e5ce35a1387d8a8a83d2f701b6;hpb=45af44d47da6933b260c734ad9ff721f63f80a4d;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index b9f1b992d..63c7a8bf2 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -75,6 +75,19 @@ static bool link_ipv4ll_enabled(Link *link) { return link->network->ipv4ll; } +static bool link_lldp_enabled(Link *link) { + if (link->flags & IFF_LOOPBACK) + return false; + + if (!link->network) + return false; + + if(link->network->bridge) + return false; + + return link->network->lldp; +} + #define FLAG_STRING(string, flag, old, new) \ (((old ^ new) & flag) \ ? ((old & flag) ? (" -" string) : (" +" string)) \ @@ -206,6 +219,12 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { if (r < 0) return -ENOMEM; + r = asprintf(&link->lldp_file, "/run/systemd/netif/lldp/%d", + link->ifindex); + if (r < 0) + return -ENOMEM; + + r = hashmap_ensure_allocated(&manager->links, NULL); if (r < 0) return r; @@ -240,12 +259,16 @@ static void link_free(Link *link) { address_free(address); } + sd_dhcp_server_unref(link->dhcp_server); sd_dhcp_client_unref(link->dhcp_client); sd_dhcp_lease_unref(link->dhcp_lease); unlink(link->lease_file); free(link->lease_file); + unlink(link->lldp_file); + free(link->lldp_file); + sd_ipv4ll_unref(link->ipv4ll); sd_dhcp6_client_unref(link->dhcp6_client); sd_icmp6_nd_unref(link->icmp6_router_discovery); @@ -364,6 +387,16 @@ static int link_stop_clients(Link *link) { } } + if (link->lldp) { + + k = sd_lldp_stop(link->lldp); + if (k < 0) { + log_link_warning(link, "Could not stop LLDP : %s", + strerror(-r)); + r = k; + } + } + return r; } @@ -656,6 +689,21 @@ int link_address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) return 1; } +static int link_set_bridge_fdb(const Link *const link) { + FdbEntry *fdb_entry; + int r = 0; + + LIST_FOREACH(static_fdb_entries, fdb_entry, link->network->static_fdb_entries) { + r = fdb_entry_configure(link->manager->rtnl, fdb_entry, link->ifindex); + if(r < 0) { + log_link_error(link, "Failed to add MAC entry to static MAC table: %s", strerror(-r)); + break; + } + } + + return r; +} + static int link_set_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { _cleanup_link_unref_ Link *link = userdata; int r; @@ -857,37 +905,7 @@ static int link_set_bridge(Link *link) { return r; } -static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) { - Link *link = userdata; - - assert(link); - assert(link->network); - assert(link->manager); - - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return; - - switch(event) { - case DHCP6_EVENT_STOP: - case DHCP6_EVENT_RESEND_EXPIRE: - case DHCP6_EVENT_RETRANS_MAX: - case DHCP6_EVENT_IP_ACQUIRE: - log_link_debug(link, "DHCPv6 event %d", event); - - break; - - default: - if (event < 0) - log_link_warning(link, "DHCPv6 error: %s", - strerror(-event)); - else - log_link_warning(link, "DHCPv6 unknown event: %d", - event); - return; - } -} - -static void icmp6_router_handler(sd_icmp6_nd *nd, int event, void *userdata) { +static void lldp_handler(sd_lldp *lldp, int event, void *userdata) { Link *link = userdata; int r; @@ -895,66 +913,13 @@ static void icmp6_router_handler(sd_icmp6_nd *nd, int event, void *userdata) { assert(link->network); assert(link->manager); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return; - - switch(event) { - case ICMP6_EVENT_ROUTER_ADVERTISMENT_NONE: - case ICMP6_EVENT_ROUTER_ADVERTISMENT_OTHER: + if (event != UPDATE_INFO) return; - case ICMP6_EVENT_ROUTER_ADVERTISMENT_TIMEOUT: - case ICMP6_EVENT_ROUTER_ADVERTISMENT_MANAGED: - break; - - default: - if (event < 0) - log_link_warning(link, "ICMPv6 error: %s", - strerror(-event)); - else - log_link_warning(link, "ICMPv6 unknown event: %d", - event); - - return; - } - - if (link->dhcp6_client) - return; - - r = sd_dhcp6_client_new(&link->dhcp6_client); + r = sd_lldp_save(link->lldp, link->lldp_file); if (r < 0) - return; - - r = sd_dhcp6_client_attach_event(link->dhcp6_client, NULL, 0); - if (r < 0) { - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); - return; - } - - r = sd_dhcp6_client_set_mac(link->dhcp6_client, - (const uint8_t *) &link->mac, - sizeof (link->mac), ARPHRD_ETHER); - if (r < 0) { - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); - return; - } - - r = sd_dhcp6_client_set_index(link->dhcp6_client, link->ifindex); - if (r < 0) { - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); - return; - } - - r = sd_dhcp6_client_set_callback(link->dhcp6_client, dhcp6_handler, - link); - if (r < 0) { - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); - return; - } + log_link_warning(link, "could not save LLDP"); - r = sd_dhcp6_client_start(link->dhcp6_client); - if (r < 0) - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); } static int link_acquire_conf(Link *link) { @@ -1004,6 +969,18 @@ static int link_acquire_conf(Link *link) { } } + if (link_lldp_enabled(link)) { + assert(link->lldp); + + log_link_debug(link, "Starting LLDP"); + + r = sd_lldp_start(link->lldp); + if (r < 0) { + log_link_warning(link, "could not start LLDP "); + return r; + } + } + return 0; } @@ -1247,6 +1224,10 @@ static int link_configure(Link *link) { assert(link->network); assert(link->state == LINK_STATE_PENDING); + r = link_set_bridge_fdb(link); + if (r < 0) + return r; + if (link_ipv4ll_enabled(link)) { r = ipv4ll_configure(link); if (r < 0) @@ -1270,27 +1251,22 @@ static int link_configure(Link *link) { } if (link_dhcp6_enabled(link)) { - r = sd_icmp6_nd_new(&link->icmp6_router_discovery); - if (r < 0) - return r; - - r = sd_icmp6_nd_attach_event(link->icmp6_router_discovery, - NULL, 0); + r = icmp6_configure(link); if (r < 0) return r; + } - r = sd_icmp6_nd_set_mac(link->icmp6_router_discovery, - &link->mac); + if (link_lldp_enabled(link)) { + r = sd_lldp_new(link->ifindex, link->ifname, &link->mac, &link->lldp); if (r < 0) return r; - r = sd_icmp6_nd_set_index(link->icmp6_router_discovery, - link->ifindex); + r = sd_lldp_attach_event(link->lldp, NULL, 0); if (r < 0) return r; - r = sd_icmp6_nd_set_callback(link->icmp6_router_discovery, - icmp6_router_handler, link); + r = sd_lldp_set_callback(link->lldp, + lldp_handler, link); if (r < 0) return r; } @@ -1557,7 +1533,6 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { Link *link; - _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; _cleanup_udev_device_unref_ struct udev_device *device = NULL; char ifindex_str[2 + DECIMAL_STR_MAX(int)]; int r; @@ -1912,6 +1887,19 @@ int link_save(Link *link) { } else unlink(link->lease_file); + if (link->lldp) { + assert(link->network); + + r = sd_lldp_save(link->lldp, link->lldp_file); + if (r < 0) + goto fail; + + fprintf(f, + "LLDP_FILE=%s\n", + link->lldp_file); + } else + unlink(link->lldp_file); + r = fflush_and_check(f); if (r < 0) goto fail;