X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=b217123ecc3efb193662c8c03b97a5a28cd1b01e;hb=538b08707ab7d34fac5b8c2753d3bf9ac12c2ebf;hp=9aca1b647786971ade07a01b80ad1b5770f0da73;hpb=17256461f500430e27a64c3f4849e809023e8c4d;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 9aca1b647..b217123ec 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -35,6 +35,8 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) { const char *ifname; int r; + assert(manager); + assert(manager->links); assert(device); assert(ret); @@ -85,22 +87,33 @@ void link_free(Link *link) { free(link); } -int link_add(Manager *m, struct udev_device *device, Link **ret) { +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); + if (!link) + return -ENODEV; + + *ret = link; + + return 0; +} + +int link_add(Manager *m, struct udev_device *device, Link **ret) { + Link *link = NULL; Network *network; int r; - uint64_t ifindex; assert(m); assert(device); - ifindex = udev_device_get_ifindex(device); - link = hashmap_get(m->links, &ifindex); - if (link) { - *ret = link; - return -EEXIST; - } - r = link_new(m, device, &link); if (r < 0) return r; @@ -384,11 +397,11 @@ static int set_hostname(sd_bus *bus, const char *hostname) { r = sd_bus_message_new_method_call( bus, + &m, "org.freedesktop.hostname1", "/org/freedesktop/hostname1", "org.freedesktop.hostname1", - "SetHostname", - &m); + "SetHostname"); if (r < 0) return r; @@ -435,7 +448,8 @@ static int link_set_mtu(Link *link, uint32_t mtu) { log_debug_link(link, "setting MTU: %" PRIu32, mtu); - r = sd_rtnl_message_new_link(RTM_SETLINK, link->ifindex, &req); + r = sd_rtnl_message_new_link(link->manager->rtnl, &req, + RTM_SETLINK, link->ifindex); if (r < 0) { log_error_link(link, "Could not allocate RTM_SETLINK message"); return r; @@ -467,6 +481,8 @@ static int dhcp_lease_lost(Link *link) { assert(link); assert(link->dhcp_lease); + log_warning_link(link, "DHCP lease lost"); + r = address_new_dynamic(&address); if (r >= 0) { sd_dhcp_lease_get_address(link->dhcp_lease, &addr); @@ -495,9 +511,14 @@ static int dhcp_lease_lost(Link *link) { } if (link->network->dhcp_hostname) { - r = set_hostname(link->manager->bus, ""); - if (r < 0) - log_error("Failed to reset transient hostname"); + const char *hostname = NULL; + + r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname); + if (r >= 0 && hostname) { + r = set_hostname(link->manager->bus, ""); + if (r < 0) + log_error("Failed to reset transient hostname"); + } } link->dhcp_lease = sd_dhcp_lease_unref(link->dhcp_lease); @@ -794,7 +815,8 @@ static int link_up(Link *link) { log_debug_link(link, "bringing link up"); - r = sd_rtnl_message_new_link(RTM_SETLINK, link->ifindex, &req); + r = sd_rtnl_message_new_link(link->manager->rtnl, &req, + RTM_SETLINK, link->ifindex); if (r < 0) { log_error_link(link, "Could not allocate RTM_SETLINK message"); return r; @@ -868,7 +890,7 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { } static int link_enter_enslave(Link *link) { - NetDev *vlan; + NetDev *vlan, *macvlan; Iterator i; int r; @@ -879,7 +901,8 @@ static int link_enter_enslave(Link *link) { link->state = LINK_STATE_ENSLAVING; if (!link->network->bridge && !link->network->bond && - hashmap_isempty(link->network->vlans)) + hashmap_isempty(link->network->vlans) && + hashmap_isempty(link->network->macvlans)) return link_enslaved(link); if (link->network->bridge) { @@ -921,10 +944,29 @@ static int link_enter_enslave(Link *link) { link->enslaving ++; } + HASHMAP_FOREACH(macvlan, link->network->macvlans, i) { + log_struct_link(LOG_DEBUG, link, + "MESSAGE=%s: enslaving by '%s'", + link->ifname, macvlan->name, 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", + link->ifname, macvlan->name, strerror(-r), + NETDEV(macvlan), NULL); + link_enter_failed(link); + return r; + } + + link->enslaving ++; + } + return 0; } -static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { +static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m, + void *userdata) { Link *link = userdata; int r; @@ -951,7 +993,7 @@ static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { return 1; } -static int link_get(Link *link) { +static int link_getlink(Link *link) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; @@ -961,13 +1003,15 @@ static int link_get(Link *link) { log_debug_link(link, "requesting link status"); - r = sd_rtnl_message_new_link(RTM_GETLINK, link->ifindex, &req); + r = sd_rtnl_message_new_link(link->manager->rtnl, &req, + RTM_GETLINK, link->ifindex); if (r < 0) { log_error_link(link, "Could not allocate RTM_GETLINK message"); return r; } - r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL); + r = sd_rtnl_call_async(link->manager->rtnl, req, link_getlink_handler, + link, 0, NULL); if (r < 0) { log_error_link(link, "Could not send rtnetlink message: %s", strerror(-r)); @@ -984,7 +1028,7 @@ int link_configure(Link *link) { assert(link->network); assert(link->state == _LINK_STATE_INVALID); - r = link_get(link); + r = link_getlink(link); if (r < 0) { link_enter_failed(link); return r;