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=57e719478a11138d3666b56b7bdf443cbbe8ef6e;hp=9eb2e890918ac4e1ae546f03b45e0323a82340d9;hb=a61bb41c29c370a7e64285525ec35baac8944149;hpb=ad0734e890b25751ef8229e47210ff11ae8fa3f3 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 9eb2e8909..57e719478 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -863,15 +863,15 @@ static int link_acquire_conf(Link *link) { return 0; } -bool link_has_carrier(unsigned flags, uint8_t operstate) { +bool link_has_carrier(Link *link) { /* see Documentation/networking/operstates.txt in the kernel sources */ - if (operstate == IF_OPER_UP) + if (link->kernel_operstate == IF_OPER_UP) return true; - if (operstate == IF_OPER_UNKNOWN) + if (link->kernel_operstate == IF_OPER_UNKNOWN) /* operstate may not be implemented, so fall back to flags */ - if ((flags & IFF_LOWER_UP) && !(flags & IFF_DORMANT)) + if ((link->flags & IFF_LOWER_UP) && !(link->flags & IFF_DORMANT)) return true; return false; @@ -885,7 +885,6 @@ bool link_has_carrier(unsigned flags, uint8_t operstate) { static int link_update_flags(Link *link, sd_rtnl_message *m) { unsigned flags, unknown_flags_added, unknown_flags_removed, unknown_flags; uint8_t operstate; - bool carrier_gained = false, carrier_lost = false; int r; assert(link); @@ -949,40 +948,11 @@ static int link_update_flags(Link *link, sd_rtnl_message *m) { unknown_flags_removed); } - carrier_gained = !link_has_carrier(link->flags, link->kernel_operstate) && - link_has_carrier(flags, operstate); - carrier_lost = link_has_carrier(link->flags, link->kernel_operstate) && - !link_has_carrier(flags, operstate); - link->flags = flags; link->kernel_operstate = operstate; link_save(link); - if (link->state == LINK_STATE_FAILED || - link->state == LINK_STATE_UNMANAGED) - return 0; - - if (carrier_gained) { - log_info_link(link, "gained carrier"); - - if (link->network) { - r = link_acquire_conf(link); - if (r < 0) { - link_enter_failed(link); - return r; - } - } - } else if (carrier_lost) { - log_info_link(link, "lost carrier"); - - r = link_stop_clients(link); - if (r < 0) { - link_enter_failed(link); - return r; - } - } - return 0; } @@ -1052,7 +1022,6 @@ static int link_joined(Link *link) { int r; assert(link); - assert(link->state == LINK_STATE_ENSLAVING); assert(link->network); if (!(link->flags & IFF_UP)) { @@ -1072,8 +1041,6 @@ static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, int r; assert(link); - assert(IN_SET(link->state, LINK_STATE_ENSLAVING, LINK_STATE_FAILED, - LINK_STATE_LINGER)); assert(link->network); link->enslaving --; @@ -1247,7 +1214,7 @@ static int link_configure(Link *link) { return r; } - if (link_has_carrier(link->flags, link->kernel_operstate)) { + if (link_has_carrier(link)) { r = link_acquire_conf(link); if (r < 0) return r; @@ -1389,6 +1356,13 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, return 0; } + r = sd_rtnl_message_addr_get_flags(message, &address->flags); + if (r < 0) { + log_warning_link(link, + "rtnl: received address with invalid flags, ignoring"); + return 0; + } + switch (address->family) { case AF_INET: r = sd_rtnl_message_read_in_addr(message, IFA_LOCAL, @@ -1550,6 +1524,7 @@ int link_update(Link *link, sd_rtnl_message *m) { struct ether_addr mac; const char *ifname; uint32_t mtu; + bool had_carrier, carrier_gained, carrier_lost; int r; assert(link); @@ -1646,7 +1621,36 @@ int link_update(Link *link, sd_rtnl_message *m) { } } - return link_update_flags(link, m); + had_carrier = link_has_carrier(link); + + r = link_update_flags(link, m); + if (r < 0) + return r; + + carrier_gained = !had_carrier && link_has_carrier(link); + carrier_lost = had_carrier && !link_has_carrier(link); + + if (carrier_gained) { + log_info_link(link, "gained carrier"); + + if (link->network) { + r = link_acquire_conf(link); + if (r < 0) { + link_enter_failed(link); + return r; + } + } + } else if (carrier_lost) { + log_info_link(link, "lost carrier"); + + r = link_stop_clients(link); + if (r < 0) { + link_enter_failed(link); + return r; + } + } + + return 0; } static void link_update_operstate(Link *link) { @@ -1655,12 +1659,15 @@ static void link_update_operstate(Link *link) { if (link->kernel_operstate == IF_OPER_DORMANT) link->operstate = LINK_OPERSTATE_DORMANT; - else if (link_has_carrier(link->flags, link->kernel_operstate)) { + else if (link_has_carrier(link)) { Address *address; uint8_t scope = RT_SCOPE_NOWHERE; /* if we have carrier, check what addresses we have */ LIST_FOREACH(addresses, address, link->addresses) { + if (address->flags & (IFA_F_TENTATIVE | IFA_F_DEPRECATED)) + continue; + if (address->scope < scope) scope = address->scope; } @@ -1721,9 +1728,17 @@ int link_save(Link *link) { admin_state, oper_state); if (link->network) { - char **address; + char **address, **domain; + bool space; fputs("DNS=", f); + space = false; + STRV_FOREACH(address, link->network->dns) { + if (space) + fputc(' ', f); + fputs(*address, f); + space = true; + } if (link->network->dhcp_dns && link->dhcp_lease) { @@ -1731,19 +1746,22 @@ int link_save(Link *link) { r = sd_dhcp_lease_get_dns(link->dhcp_lease, &addresses); if (r > 0) { + if (space) + fputc(' ', f); 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="); + space = false; + STRV_FOREACH(address, link->network->ntp) { + if (space) + fputc(' ', f); + fputs(*address, f); + space = true; + } if (link->network->dhcp_ntp && link->dhcp_lease) { @@ -1751,27 +1769,40 @@ int link_save(Link *link) { r = sd_dhcp_lease_get_ntp(link->dhcp_lease, &addresses); if (r > 0) { + if (space) + fputc(' ', f); 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); + fprintf(f, "DOMAINS="); + space = false; + STRV_FOREACH(domain, link->network->domains) { + if (space) + fputc(' ', f); + fputs(*domain, f); + space = true; + } + if (link->network->dhcp_domains && link->dhcp_lease) { const char *domainname; r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname); - if (r >= 0) - fprintf(f, "DOMAINS=%s\n", domainname); + if (r >= 0) { + if (space) + fputc(' ', f); + fputs(domainname, f); + } } + fputs("\n", f); + + fprintf(f, "WILDCARD_DOMAIN=%s\n", + yes_no(link->network->wildcard_domain)); + fprintf(f, "LLMNR=%s\n", llmnr_support_to_string(link->network->llmnr)); }