#include <linux/if.h>
#include <unistd.h>
-#include "networkd.h"
+#include "networkd-link.h"
#include "networkd-netdev.h"
#include "libudev-private.h"
#include "udev-util.h"
#include "network-internal.h"
#include "conf-parser.h"
-#include "network-util.h"
#include "dhcp-lease-internal.h"
static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
link->n_ref = 1;
link->manager = manager;
- link->state = LINK_STATE_INITIALIZING;
+ link->state = LINK_STATE_PENDING;
link->ifindex = ifindex;
link->ifname = strdup(ifname);
if (!link->ifname)
if (r < 0)
log_debug_link(link, "MAC address not found for new device, continuing without");
- r = asprintf(&link->state_file, "/run/systemd/netif/links/%d", link->ifindex);
+ r = asprintf(&link->state_file, "/run/systemd/netif/links/%d",
+ link->ifindex);
if (r < 0)
return -ENOMEM;
- r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%d", link->ifindex);
+ r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%d",
+ link->ifindex);
if (r < 0)
return -ENOMEM;
if (link->dhcp_client) {
k = sd_dhcp_client_stop(link->dhcp_client);
if (k < 0) {
- log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r));
+ log_warning_link(link, "Could not stop DHCPv4 client: %s",
+ strerror(-r));
r = k;
}
}
if (link->ipv4ll) {
k = sd_ipv4ll_stop(link->ipv4ll);
if (k < 0) {
- log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r));
+ log_warning_link(link, "Could not stop IPv4 link-local: %s",
+ strerror(-r));
r = k;
}
}
if (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));
+ log_warning_link(link, "Could not stop DHCPv4 server: %s",
+ strerror(-r));
r = k;
}
}
if (link->dhcp6_client) {
k = sd_dhcp6_client_stop(link->dhcp6_client);
if (k < 0) {
- log_warning_link(link, "Could not stop DHCPv6 client: %s", strerror(-r));
+ log_warning_link(link, "Could not stop DHCPv6 client: %s",
+ strerror(-r));
r = k;
}
}
k = sd_icmp6_nd_stop(link->icmp6_router_discovery);
if (k < 0) {
- log_warning_link(link, "Could not stop ICMPv6 router discovery: %s", strerror(-r));
+ log_warning_link(link,
+ "Could not stop ICMPv6 router discovery: %s",
+ strerror(-r));
r = k;
}
}
return r;
}
-static void link_enter_failed(Link *link) {
+void link_enter_failed(Link *link) {
assert(link);
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
address = link_find_dhcp_server_address(link);
if (!address) {
- log_warning_link(link, "Failed to find suitable address for DHCPv4 server instance.");
+ log_warning_link(link,
+ "Failed to find suitable address for DHCPv4 server instance.");
link_enter_failed(link);
return 0;
}
log_debug_link(link, "offering DHCPv4 leases");
- r = sd_dhcp_server_set_address(link->dhcp_server, &address->in_addr.in, address->prefixlen);
+ r = sd_dhcp_server_set_address(link->dhcp_server,
+ &address->in_addr.in,
+ address->prefixlen);
if (r < 0)
return r;
return 0;
}
+void link_client_handler(Link *link) {
+ assert(link);
+ assert(link->network);
+
+ if (!link->static_configured)
+ return;
+
+ if (link->network->ipv4ll)
+ if (!link->ipv4ll_address ||
+ !link->ipv4ll_route)
+ return;
+
+ if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4))
+ if (!link->dhcp4_configured)
+ return;
+
+ if (link->state != LINK_STATE_CONFIGURED)
+ link_enter_configured(link);
+
+ return;
+}
+
static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
_cleanup_link_unref_ Link *link = userdata;
int r;
- assert(link->route_messages > 0);
+ assert(link->link_messages > 0);
assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES,
LINK_STATE_SETTING_ROUTES, LINK_STATE_FAILED,
LINK_STATE_LINGER));
- link->route_messages --;
+ link->link_messages --;
- if (IN_SET(LINK_STATE_FAILED, LINK_STATE_LINGER))
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return 1;
r = sd_rtnl_message_get_errno(m);
"ERRNO=%d", -r,
NULL);
- /* we might have received an old reply after moving back to SETTING_ADDRESSES,
- * ignore it */
- if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) {
+ if (link->link_messages == 0) {
log_debug_link(link, "routes set");
- link_enter_configured(link);
+ link->static_configured = true;
+ link_client_handler(link);
}
return 1;
}
-static int link_set_dhcp_routes(Link *link) {
- struct sd_dhcp_route *static_routes;
- int r, n, i;
-
- assert(link);
-
- n = sd_dhcp_lease_get_routes(link->dhcp_lease, &static_routes);
- if (n < 0) {
- if (n != -ENOENT)
- log_warning_link(link, "DHCP error: could not get routes: %s", strerror(-n));
- return n;
- }
-
- for (i = 0; i < n; i++) {
- _cleanup_route_free_ Route *route = NULL;
-
- r = route_new_dynamic(&route, RTPROT_DHCP);
- if (r < 0) {
- log_error_link(link, "Could not allocate route: %s",
- strerror(-r));
- return r;
- }
-
- route->family = AF_INET;
- route->in_addr.in = static_routes[i].gw_addr;
- route->dst_addr.in = static_routes[i].dst_addr;
- route->dst_prefixlen = static_routes[i].dst_prefixlen;
- route->metrics = DHCP_ROUTE_METRIC;
-
- r = route_configure(route, link, &route_handler);
- if (r < 0) {
- log_warning_link(link,
- "could not set host route: %s", strerror(-r));
- return r;
- }
-
- link->route_messages ++;
- }
-
- return 0;
-}
-
-static bool ipv4ll_is_bound(sd_ipv4ll *ll) {
- int r;
- struct in_addr addr;
-
- if (!ll)
- return false;
-
- r = sd_ipv4ll_get_address(ll, &addr);
- if (r < 0)
- return false;
-
- return true;
-}
-
static int link_enter_set_routes(Link *link) {
Route *rt;
int r;
link->state = LINK_STATE_SETTING_ROUTES;
- if (!link->network->static_routes &&
- !link->dhcp_lease &&
- !ipv4ll_is_bound(link->ipv4ll))
- return link_enter_configured(link);
-
- log_debug_link(link, "setting routes");
-
LIST_FOREACH(routes, rt, link->network->static_routes) {
r = route_configure(rt, link, &route_handler);
if (r < 0) {
log_warning_link(link,
- "could not set routes: %s", strerror(-r));
- link_enter_failed(link);
- return r;
- }
-
- link->route_messages ++;
- }
-
- if (ipv4ll_is_bound(link->ipv4ll)) {
- _cleanup_route_free_ Route *route = NULL;
-
- r = route_new_dynamic(&route, RTPROT_STATIC);
- if (r < 0) {
- log_error_link(link, "Could not allocate route: %s",
- strerror(-r));
- return r;
- }
-
- route->family = AF_INET;
- route->scope = RT_SCOPE_LINK;
- route->metrics = IPV4LL_ROUTE_METRIC;
-
- r = route_configure(route, link, &route_handler);
- if (r < 0) {
- log_warning_link(link,
- "could not set routes: %s", strerror(-r));
- link_enter_failed(link);
- return r;
- }
-
- link->route_messages ++;
- }
-
- 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);
- if (r < 0 && r != -ENOENT) {
- log_warning_link(link, "DHCP error: could not get gateway: %s",
+ "could not set routes: %s",
strerror(-r));
+ link_enter_failed(link);
return r;
}
- if (r >= 0) {
- r = route_new_dynamic(&route, RTPROT_DHCP);
- if (r < 0) {
- log_error_link(link, "Could not allocate route: %s",
- strerror(-r));
- return r;
- }
-
- r = route_new_dynamic(&route_gw, RTPROT_DHCP);
- 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;
- route_gw->metrics = DHCP_ROUTE_METRIC;
-
- 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;
- route->metrics = DHCP_ROUTE_METRIC;
-
- r = route_configure(route, link, &route_handler);
- if (r < 0) {
- log_warning_link(link,
- "could not set routes: %s", strerror(-r));
- link_enter_failed(link);
- return r;
- }
-
- link->route_messages ++;
- }
-
- if (link->network->dhcp_routes)
- link_set_dhcp_routes(link);
+ link->link_messages ++;
}
- if (link->route_messages == 0) {
- link_enter_configured(link);
- }
+ if (link->link_messages == 0) {
+ link->static_configured = true;
+ link_client_handler(link);
+ } else
+ log_debug_link(link, "setting routes");
return 0;
}
-static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+int link_route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
_cleanup_link_unref_ Link *link = userdata;
int r;
return 1;
}
-static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
_cleanup_link_unref_ Link *link = userdata;
int r;
for (; m; m = sd_rtnl_message_next(m)) {
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_debug_link(link, "getting address failed: %s", strerror(-r));
+ log_debug_link(link, "getting address failed: %s",
+ strerror(-r));
continue;
}
r = link_rtnl_process_address(rtnl, m, link->manager);
if (r < 0)
- log_warning_link(link, "could not process address: %s", strerror(-r));
+ log_warning_link(link, "could not process address: %s",
+ strerror(-r));
}
return 1;
assert(m);
assert(link);
assert(link->ifname);
- assert(link->addr_messages > 0);
+ assert(link->link_messages > 0);
assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES,
LINK_STATE_FAILED, LINK_STATE_LINGER));
- link->addr_messages --;
+ link->link_messages --;
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return 1;
link_get_address_handler(rtnl, m, link);
}
- if (link->addr_messages == 0) {
+ if (link->link_messages == 0) {
log_debug_link(link, "addresses set");
link_enter_set_routes(link);
}
static int link_enter_set_addresses(Link *link) {
Address *ad;
int r;
- uint32_t lifetime = CACHE_INFO_INFINITY_LIFE_TIME;
assert(link);
assert(link->network);
link->state = LINK_STATE_SETTING_ADDRESSES;
- if (!link->network->static_addresses &&
- !link->dhcp_lease &&
- !ipv4ll_is_bound(link->ipv4ll))
- return link_enter_set_routes(link);
-
- log_debug_link(link, "setting addresses");
-
LIST_FOREACH(addresses, ad, link->network->static_addresses) {
r = address_configure(ad, link, &address_handler);
if (r < 0) {
log_warning_link(link,
- "could not set addresses: %s", strerror(-r));
- link_enter_failed(link);
- return r;
- }
-
- link->addr_messages ++;
- }
-
- if (link->ipv4ll) {
- _cleanup_address_free_ Address *ll_addr = NULL;
- struct in_addr addr;
-
- r = sd_ipv4ll_get_address(link->ipv4ll, &addr);
- if (r < 0 && r != -ENOENT) {
- log_warning_link(link, "IPV4LL error: no address: %s",
- strerror(-r));
- return r;
- }
-
- if (r != -ENOENT) {
- r = address_new_dynamic(&ll_addr);
- if (r < 0) {
- log_error_link(link, "Could not allocate address: %s", strerror(-r));
- return r;
- }
-
- ll_addr->family = AF_INET;
- ll_addr->in_addr.in = addr;
- ll_addr->prefixlen = 16;
- ll_addr->broadcast.s_addr = ll_addr->in_addr.in.s_addr | htonl(0xfffffffflu >> ll_addr->prefixlen);
- ll_addr->scope = RT_SCOPE_LINK;
-
- r = address_configure(ll_addr, link, &address_handler);
- if (r < 0) {
- log_warning_link(link,
- "could not set addresses: %s", strerror(-r));
- link_enter_failed(link);
- return r;
- }
-
- link->addr_messages ++;
- }
- }
-
- if (link->dhcp_lease) {
- _cleanup_address_free_ Address *address = NULL;
- struct in_addr addr;
- struct in_addr netmask;
- unsigned prefixlen;
-
- r = sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
- if (r < 0) {
- log_warning_link(link, "DHCP error: no address: %s",
+ "could not set addresses: %s",
strerror(-r));
- return r;
- }
-
- if (!link->network->dhcp_critical) {
- r = sd_dhcp_lease_get_lifetime(link->dhcp_lease,
- &lifetime);
- if (r < 0) {
- log_warning_link(link, "DHCP error: no lifetime: %s",
- strerror(-r));
- return r;
- }
- }
-
- r = sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
- if (r < 0) {
- log_warning_link(link, "DHCP error: no netmask: %s",
- strerror(-r));
- return r;
- }
-
- prefixlen = in_addr_netmask_to_prefixlen(&netmask);
-
- r = address_new_dynamic(&address);
- if (r < 0) {
- log_error_link(link, "Could not allocate address: %s",
- strerror(-r));
- return r;
- }
-
- address->family = AF_INET;
- address->in_addr.in = addr;
- address->cinfo.ifa_prefered = lifetime;
- address->cinfo.ifa_valid = lifetime;
- address->prefixlen = prefixlen;
- address->broadcast.s_addr = addr.s_addr | ~netmask.s_addr;
-
- /* use update rather than configure so that we will update the lifetime
- of an existing address if it has already been configured */
- r = address_update(address, link, &address_handler);
- if (r < 0) {
- log_warning_link(link,
- "could not set addresses: %s", strerror(-r));
link_enter_failed(link);
return r;
}
- link->addr_messages ++;
+ link->link_messages ++;
}
+ if (link->link_messages == 0) {
+ link_enter_set_routes(link);
+ } else
+ log_debug_link(link, "setting addresses");
+
return 0;
}
-static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+int link_address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
_cleanup_link_unref_ Link *link = userdata;
int r;
return 1;
}
-static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
+static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata,
+ sd_bus_error *ret_error) {
_cleanup_link_unref_ Link *link = userdata;
int r;
if (r < 0)
r = -r;
if (r > 0)
- log_warning_link(link, "Could not set hostname: %s", strerror(r));
+ log_warning_link(link, "Could not set hostname: %s",
+ strerror(r));
return 1;
}
-static int link_set_hostname(Link *link, const char *hostname) {
+int link_set_hostname(Link *link, const char *hostname) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r = 0;
log_debug_link(link, "Setting transient hostname: '%s'", hostname);
- if (!link->manager->bus) { /* TODO: replace by assert when we can rely on kdbus */
- log_info_link(link, "Not connected to system bus, ignoring transient hostname.");
+ if (!link->manager->bus) {
+ /* TODO: replace by assert when we can rely on kdbus */
+ log_info_link(link,
+ "Not connected to system bus, ignoring transient hostname.");
return 0;
}
if (r < 0)
return r;
- r = sd_bus_call_async(link->manager->bus, NULL, m, set_hostname_handler, link, 0);
+ r = sd_bus_call_async(link->manager->bus, NULL, m, set_hostname_handler,
+ link, 0);
if (r < 0) {
- log_error_link(link, "Could not set transient hostname: %s", strerror(-r));
+ log_error_link(link, "Could not set transient hostname: %s",
+ strerror(-r));
return r;
}
return 1;
}
-static int link_set_mtu(Link *link, uint32_t mtu) {
+int link_set_mtu(Link *link, uint32_t mtu) {
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
return r;
}
- r = sd_rtnl_call_async(link->manager->rtnl, req, set_mtu_handler, link, 0, NULL);
+ r = sd_rtnl_call_async(link->manager->rtnl, req, set_mtu_handler, link,
+ 0, NULL);
if (r < 0) {
log_error_link(link,
- "Could not send rtnetlink message: %s", strerror(-r));
+ "Could not send rtnetlink message: %s",
+ strerror(-r));
return r;
}
return 0;
}
-static int dhcp_lease_lost(Link *link) {
- _cleanup_address_free_ Address *address = NULL;
- struct in_addr addr;
- struct in_addr netmask;
- struct in_addr gateway;
- unsigned prefixlen;
- int r;
-
- assert(link);
- assert(link->dhcp_lease);
-
- log_warning_link(link, "DHCP lease lost");
-
- if (link->network->dhcp_routes) {
- struct sd_dhcp_route *routes;
- int n, i;
-
- n = sd_dhcp_lease_get_routes(link->dhcp_lease, &routes);
- if (n >= 0) {
- for (i = 0; i < n; i++) {
- _cleanup_route_free_ Route *route = NULL;
-
- r = route_new_dynamic(&route, RTPROT_UNSPEC);
- if (r >= 0) {
- route->family = AF_INET;
- route->in_addr.in = routes[i].gw_addr;
- route->dst_addr.in = routes[i].dst_addr;
- route->dst_prefixlen = routes[i].dst_prefixlen;
-
- route_drop(route, link, &route_drop_handler);
- }
- }
- }
- }
-
- r = address_new_dynamic(&address);
- if (r >= 0) {
- r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway);
- if (r >= 0) {
- _cleanup_route_free_ Route *route_gw = NULL;
- _cleanup_route_free_ Route *route = NULL;
-
- r = route_new_dynamic(&route_gw, RTPROT_UNSPEC);
- if (r >= 0) {
- route_gw->family = AF_INET;
- route_gw->dst_addr.in = gateway;
- route_gw->dst_prefixlen = 32;
- route_gw->scope = RT_SCOPE_LINK;
-
- route_drop(route_gw, link, &route_drop_handler);
- }
-
- r = route_new_dynamic(&route, RTPROT_UNSPEC);
- if (r >= 0) {
- route->family = AF_INET;
- route->in_addr.in = gateway;
-
- route_drop(route, link, &route_drop_handler);
- }
- }
-
- sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
- sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
- prefixlen = in_addr_netmask_to_prefixlen(&netmask);
-
- address->family = AF_INET;
- address->in_addr.in = addr;
- address->prefixlen = prefixlen;
-
- address_drop(address, link, &address_drop_handler);
- }
-
- if (link->network->dhcp_mtu) {
- uint16_t mtu;
-
- r = sd_dhcp_lease_get_mtu(link->dhcp_lease, &mtu);
- if (r >= 0 && link->original_mtu != mtu) {
- r = link_set_mtu(link, link->original_mtu);
- if (r < 0) {
- log_warning_link(link, "DHCP error: could not reset MTU");
- link_enter_failed(link);
- return r;
- }
- }
- }
-
- if (link->network->dhcp_hostname) {
- const char *hostname = NULL;
-
- r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname);
- if (r >= 0 && hostname) {
- r = link_set_hostname(link, "");
- if (r < 0)
- log_error_link(link, "Failed to reset transient hostname");
- }
- }
-
- link->dhcp_lease = sd_dhcp_lease_unref(link->dhcp_lease);
-
- return 0;
-}
-
-static int dhcp_lease_renew(sd_dhcp_client *client, Link *link) {
- sd_dhcp_lease *lease;
- int r;
-
- r = sd_dhcp_client_get_lease(client, &lease);
- if (r < 0) {
- log_warning_link(link, "DHCP error: no lease %s",
- strerror(-r));
- return r;
- }
-
- sd_dhcp_lease_unref(link->dhcp_lease);
- link->dhcp_lease = lease;
-
- link_enter_set_addresses(link);
-
- return 0;
-}
-
-static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) {
- sd_dhcp_lease *lease;
- struct in_addr address;
- struct in_addr netmask;
- struct in_addr gateway;
- unsigned prefixlen;
- int r;
-
- assert(client);
- assert(link);
-
- r = sd_dhcp_client_get_lease(client, &lease);
- if (r < 0) {
- log_warning_link(link, "DHCP error: no lease: %s",
- strerror(-r));
- return r;
- }
-
- r = sd_dhcp_lease_get_address(lease, &address);
- if (r < 0) {
- log_warning_link(link, "DHCP error: no address: %s",
- strerror(-r));
- return r;
- }
-
- r = sd_dhcp_lease_get_netmask(lease, &netmask);
- if (r < 0) {
- log_warning_link(link, "DHCP error: no netmask: %s",
- strerror(-r));
- return r;
- }
-
- prefixlen = in_addr_netmask_to_prefixlen(&netmask);
-
- r = sd_dhcp_lease_get_router(lease, &gateway);
- if (r < 0 && r != -ENOENT) {
- log_warning_link(link, "DHCP error: could not get gateway: %s",
- strerror(-r));
- return r;
- }
-
- if (r >= 0)
- log_struct_link(LOG_INFO, link,
- "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
- IFNAMSIZ,
- link->ifname,
- ADDRESS_FMT_VAL(address),
- prefixlen,
- ADDRESS_FMT_VAL(gateway),
- "ADDRESS=%u.%u.%u.%u",
- ADDRESS_FMT_VAL(address),
- "PREFIXLEN=%u",
- prefixlen,
- "GATEWAY=%u.%u.%u.%u",
- ADDRESS_FMT_VAL(gateway),
- NULL);
- else
- log_struct_link(LOG_INFO, link,
- "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u",
- IFNAMSIZ,
- link->ifname,
- ADDRESS_FMT_VAL(address),
- prefixlen,
- "ADDRESS=%u.%u.%u.%u",
- ADDRESS_FMT_VAL(address),
- "PREFIXLEN=%u",
- prefixlen,
- NULL);
-
- link->dhcp_lease = lease;
-
- if (link->network->dhcp_mtu) {
- uint16_t mtu;
-
- r = sd_dhcp_lease_get_mtu(lease, &mtu);
- if (r >= 0) {
- r = link_set_mtu(link, mtu);
- if (r < 0)
- log_error_link(link, "Failed to set MTU "
- "to %" PRIu16, mtu);
- }
- }
-
- if (link->network->dhcp_hostname) {
- const char *hostname;
-
- r = sd_dhcp_lease_get_hostname(lease, &hostname);
- if (r >= 0) {
- r = link_set_hostname(link, hostname);
- if (r < 0)
- log_error_link(link, "Failed to set transient hostname "
- "to '%s'", hostname);
- }
- }
-
- link_enter_set_addresses(link);
-
- return 0;
-}
-
-static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
- Link *link = userdata;
- int r = 0;
-
- assert(link);
- assert(link->network);
- assert(link->manager);
-
- if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
- return;
-
- switch (event) {
- case DHCP_EVENT_EXPIRED:
- case DHCP_EVENT_STOP:
- case DHCP_EVENT_IP_CHANGE:
- if (link->network->dhcp_critical) {
- log_error_link(link, "DHCPv4 connection considered system critical, "
- "ignoring request to reconfigure it.");
- return;
- }
-
- if (link->dhcp_lease) {
- r = dhcp_lease_lost(link);
- if (r < 0) {
- link_enter_failed(link);
- return;
- }
- }
-
- if (event == DHCP_EVENT_IP_CHANGE) {
- r = dhcp_lease_acquired(client, link);
- if (r < 0) {
- link_enter_failed(link);
- return;
- }
- }
-
- break;
- case DHCP_EVENT_RENEW:
- r = dhcp_lease_renew(client, link);
- if (r < 0) {
- link_enter_failed(link);
- return;
- }
- break;
- case DHCP_EVENT_IP_ACQUIRE:
- r = dhcp_lease_acquired(client, link);
- if (r < 0) {
- link_enter_failed(link);
- return;
- }
- break;
- default:
- if (event < 0)
- log_warning_link(link, "DHCP error: client failed: %s", strerror(-event));
- else
- log_warning_link(link, "DHCP unknown event: %d", event);
- break;
- }
-
- return;
-}
-
-static int ipv4ll_address_lost(Link *link) {
- int r;
- struct in_addr addr;
-
- assert(link);
-
- r = sd_ipv4ll_get_address(link->ipv4ll, &addr);
- if (r >= 0) {
- _cleanup_address_free_ Address *address = NULL;
- _cleanup_route_free_ Route *route = NULL;
-
- log_debug_link(link, "IPv4 link-local release %u.%u.%u.%u",
- ADDRESS_FMT_VAL(addr));
-
- r = address_new_dynamic(&address);
- if (r < 0) {
- log_error_link(link, "Could not allocate address: %s", strerror(-r));
- return r;
- }
-
- address->family = AF_INET;
- address->in_addr.in = addr;
- address->prefixlen = 16;
- address->scope = RT_SCOPE_LINK;
-
- address_drop(address, link, &address_drop_handler);
-
- r = route_new_dynamic(&route, RTPROT_UNSPEC);
- if (r < 0) {
- log_error_link(link, "Could not allocate route: %s",
- strerror(-r));
- return r;
- }
-
- route->family = AF_INET;
- route->scope = RT_SCOPE_LINK;
- route->metrics = 99;
-
- route_drop(route, link, &route_drop_handler);
- }
-
- return 0;
-}
-
-static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) {
- struct in_addr address;
- int r;
-
- assert(ll);
- assert(link);
-
- r = sd_ipv4ll_get_address(ll, &address);
- if (r < 0)
- return r;
-
- log_struct_link(LOG_INFO, link,
- "MESSAGE=%-*s: IPv4 link-local address %u.%u.%u.%u",
- IFNAMSIZ,
- link->ifname,
- ADDRESS_FMT_VAL(address),
- NULL);
-
- link_enter_set_addresses(link);
-
- return 0;
-}
-
-static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){
- Link *link = userdata;
- int r;
-
- assert(link);
- assert(link->network);
- assert(link->manager);
-
- if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
- return;
-
- switch(event) {
- case IPV4LL_EVENT_STOP:
- case IPV4LL_EVENT_CONFLICT:
- r = ipv4ll_address_lost(link);
- if (r < 0) {
- link_enter_failed(link);
- return;
- }
- break;
- case IPV4LL_EVENT_BIND:
- r = ipv4ll_address_claimed(ll, link);
- if (r < 0) {
- link_enter_failed(link);
- return;
- }
- break;
- default:
- if (event < 0)
- log_warning_link(link, "IPv4 link-local error: %s", strerror(-event));
- else
- log_warning_link(link, "IPv4 link-local unknown event: %d", event);
- break;
- }
-}
-
static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) {
Link *link = userdata;
r = sd_icmp6_router_solicitation_start(link->icmp6_router_discovery);
if (r < 0) {
- log_warning_link(link, "could not start IPv6 router discovery");
+ log_warning_link(link,
+ "could not start IPv6 router discovery");
return r;
}
}
unknown_flags_added = ((link->flags ^ flags) & flags & unknown_flags);
unknown_flags_removed = ((link->flags ^ flags) & link->flags & unknown_flags);
- /* link flags are currently at most 18 bits, let's align to printing 20 */
+ /* link flags are currently at most 18 bits, let's align to
+ * printing 20 */
if (unknown_flags_added)
- log_debug_link(link, "unknown link flags gained: %#.5x (ignoring)",
+ log_debug_link(link,
+ "unknown link flags gained: %#.5x (ignoring)",
unknown_flags_added);
if (unknown_flags_removed)
- log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)",
+ log_debug_link(link,
+ "unknown link flags lost: %#.5x (ignoring)",
unknown_flags_removed);
}
r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP);
if (r < 0) {
- log_error_link(link, "Could not set link flags: %s", strerror(-r));
+ log_error_link(link, "Could not set link flags: %s",
+ strerror(-r));
return r;
}
- r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
+ r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link,
+ 0, NULL);
if (r < 0) {
log_error_link(link,
- "Could not send rtnetlink message: %s", strerror(-r));
+ "Could not send rtnetlink message: %s",
+ strerror(-r));
return r;
}
int r;
assert(link);
- assert(link->state == LINK_STATE_ENSLAVING);
assert(link->network);
if (!(link->flags & IFF_UP)) {
return link_enter_set_addresses(link);
}
-static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
+ void *userdata) {
_cleanup_link_unref_ Link *link = userdata;
int r;
assert(link);
- assert(IN_SET(link->state, LINK_STATE_ENSLAVING, LINK_STATE_FAILED,
- LINK_STATE_LINGER));
assert(link->network);
link->enslaving --;
assert(link);
assert(link->network);
- assert(link->state == LINK_STATE_INITIALIZING);
+ assert(link->state == LINK_STATE_PENDING);
link->state = LINK_STATE_ENSLAVING;
log_struct_link(LOG_WARNING, link,
"MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
- link->ifname, link->network->bond->ifname, strerror(-r),
+ link->ifname, link->network->bond->ifname,
+ strerror(-r),
NETDEVIF(link->network->bond),
NULL);
link_enter_failed(link);
NETDEVIF(link->network->bridge),
NULL);
- r = netdev_join(link->network->bridge, link, &netdev_join_handler);
+ r = netdev_join(link->network->bridge, link,
+ &netdev_join_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
"MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
- link->ifname, link->network->bridge->ifname, strerror(-r),
+ link->ifname, link->network->bridge->ifname,
+ strerror(-r),
NETDEVIF(link->network->bridge),
NULL);
link_enter_failed(link);
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
- link->ifname, netdev->ifname, NETDEVIF(netdev), NULL);
+ link->ifname, netdev->ifname, NETDEVIF(netdev),
+ NULL);
r = netdev_join(netdev, link, &netdev_join_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
"MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
- link->ifname, netdev->ifname, strerror(-r),
+ link->ifname, netdev->ifname,
+ strerror(-r),
NETDEVIF(netdev), NULL);
link_enter_failed(link);
return r;
int r;
assert(link);
- assert(link->state == LINK_STATE_INITIALIZING);
+ assert(link->network);
+ assert(link->state == LINK_STATE_PENDING);
if (link->network->ipv4ll) {
- uint8_t seed[8];
-
- r = sd_ipv4ll_new(&link->ipv4ll);
- if (r < 0)
- return r;
-
- if (link->udev_device) {
- 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_mac(link->ipv4ll, &link->mac);
- 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);
+ r = ipv4ll_configure(link);
if (r < 0)
return r;
}
if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4)) {
- 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_mac(link->dhcp_client, &link->mac);
- 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;
-
- r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link->network->dhcp_broadcast);
+ r = dhcp4_configure(link);
if (r < 0)
return r;
-
- if (link->mtu) {
- r = sd_dhcp_client_set_mtu(link->dhcp_client, link->mtu);
- if (r < 0)
- return r;
- }
-
- if (link->network->dhcp_mtu) {
- r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_INTERFACE_MTU);
- if (r < 0)
- return r;
- }
-
- if (link->network->dhcp_routes) {
- r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_STATIC_ROUTE);
- if (r < 0)
- return r;
- r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_CLASSLESS_STATIC_ROUTE);
- if (r < 0)
- return r;
- }
-
- if (link->network->dhcp_sendhost) {
- _cleanup_free_ char *hostname = gethostname_malloc();
- if (!hostname)
- return -ENOMEM;
-
- if (!is_localhost(hostname)) {
- r = sd_dhcp_client_set_hostname(link->dhcp_client, hostname);
- if (r < 0)
- return r;
- }
- }
-
- if (link->network->dhcp_vendor_class_identifier) {
- r = sd_dhcp_client_set_vendor_class_identifier(link->dhcp_client,
- link->network->dhcp_vendor_class_identifier);
- if (r < 0)
- return r;
- }
}
if (link->network->dhcp_server) {
return link_enter_join_netdev(link);
}
-static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m,
+ void *userdata) {
_cleanup_link_unref_ Link *link = userdata;
Network *network;
int r;
assert(link->ifname);
assert(link->manager);
- if (link->state != LINK_STATE_INITIALIZING)
+ if (link->state != LINK_STATE_PENDING)
return 1;
log_debug_link(link, "link state is up-to-date");
- r = network_get(link->manager, link->udev_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 1;
assert(link->manager->rtnl);
assert(device);
- if (link->state != LINK_STATE_INITIALIZING)
+ if (link->state != LINK_STATE_PENDING)
return 0;
if (link->udev_device)
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 */
+ /* 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);
+ 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);
+ 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) {
+int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message,
+ void *userdata) {
Manager *m = userdata;
Link *link = NULL;
uint16_t type;
_cleanup_address_free_ Address *address = NULL;
Address *ad;
char buf[INET6_ADDRSTRLEN];
+ char valid_buf[FORMAT_TIMESPAN_MAX];
+ const char *valid_str = NULL;
bool address_dropped = false;
int r, ifindex;
r = sd_rtnl_message_addr_get_family(message, &address->family);
if (r < 0 || !IN_SET(address->family, AF_INET, AF_INET6)) {
- log_warning_link(link, "rtnl: received address with invalid family, ignoring");
+ log_warning_link(link,
+ "rtnl: received address with invalid family, ignoring");
return 0;
}
r = sd_rtnl_message_addr_get_prefixlen(message, &address->prefixlen);
if (r < 0) {
- log_warning_link(link, "rtnl: received address with invalid prefixlen, ignoring");
+ log_warning_link(link,
+ "rtnl: received address with invalid prefixlen, ignoring");
return 0;
}
r = sd_rtnl_message_addr_get_scope(message, &address->scope);
if (r < 0) {
- log_warning_link(link, "rtnl: received address with invalid scope, ignoring");
+ log_warning_link(link,
+ "rtnl: received address with invalid scope, ignoring");
+ 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, &address->in_addr.in);
+ r = sd_rtnl_message_read_in_addr(message, IFA_LOCAL,
+ &address->in_addr.in);
if (r < 0) {
- log_warning_link(link, "rtnl: received address without valid address, ignoring");
+ log_warning_link(link,
+ "rtnl: received address without valid address, ignoring");
return 0;
}
break;
case AF_INET6:
- r = sd_rtnl_message_read_in6_addr(message, IFA_ADDRESS, &address->in_addr.in6);
+ r = sd_rtnl_message_read_in6_addr(message, IFA_ADDRESS,
+ &address->in_addr.in6);
if (r < 0) {
- log_warning_link(link, "rtnl: received address without valid address, ignoring");
+ log_warning_link(link,
+ "rtnl: received address without valid address, ignoring");
return 0;
}
assert_not_reached("invalid address family");
}
- if (!inet_ntop(address->family, &address->in_addr, buf, INET6_ADDRSTRLEN)) {
+ if (!inet_ntop(address->family, &address->in_addr, buf,
+ INET6_ADDRSTRLEN)) {
log_warning_link(link, "could not print address");
return 0;
}
+ r = sd_rtnl_message_read_cache_info(message, IFA_CACHEINFO,
+ &address->cinfo);
+ if (r >= 0) {
+ if (address->cinfo.ifa_valid == CACHE_INFO_INFINITY_LIFE_TIME)
+ valid_str = "ever";
+ else
+ valid_str = format_timespan(valid_buf, FORMAT_TIMESPAN_MAX,
+ address->cinfo.ifa_valid * USEC_PER_SEC,
+ USEC_PER_SEC);
+ }
+
LIST_FOREACH(addresses, ad, link->addresses) {
if (address_equal(ad, address)) {
LIST_REMOVE(addresses, link->addresses, ad);
switch (type) {
case RTM_NEWADDR:
if (!address_dropped)
- log_debug_link(link, "added address: %s/%u", buf,
- address->prefixlen);
+ log_debug_link(link, "added address: %s/%u (valid for %s)",
+ buf, address->prefixlen,
+ strna(valid_str));
else
- log_debug_link(link, "updated address: %s/%u", buf,
- address->prefixlen);
+ log_debug_link(link, "updated address: %s/%u (valid for %s)",
+ buf, address->prefixlen,
+ strna(valid_str));
LIST_PREPEND(addresses, link->addresses, address);
address = NULL;
break;
case RTM_DELADDR:
if (address_dropped) {
- log_debug_link(link, "removed address: %s/%u", buf,
- address->prefixlen);
+ log_debug_link(link, "removed address: %s/%u (valid for %s)",
+ buf, address->prefixlen,
+ strna(valid_str));
link_save(link);
} else
- log_warning_link(link, "removing non-existent address: %s/%u",
- buf, address->prefixlen);
+ log_warning_link(link,
+ "removing non-existent address: %s/%u (valid for %s)",
+ buf, address->prefixlen,
+ strna(valid_str));
break;
default:
log_debug_link(link, "link %d added", link->ifindex);
- r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, link->ifindex, 0);
+ r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, link->ifindex,
+ 0);
if (r < 0)
return r;
- r = sd_rtnl_call_async(m->rtnl, req, link_get_address_handler, link, 0, NULL);
+ r = sd_rtnl_call_async(m->rtnl, req, link_get_address_handler, link, 0,
+ NULL);
if (r < 0)
return r;
sprintf(ifindex_str, "n%d", link->ifindex);
device = udev_device_new_from_device_id(m->udev, ifindex_str);
if (!device) {
- log_warning_link(link, "could not find udev device: %m");
+ log_warning_link(link,
+ "could not find udev device: %m");
return -errno;
}
if (udev_device_get_is_initialized(device) <= 0) {
/* not yet ready */
- log_debug_link(link, "udev initializing link...");
+ log_debug_link(link, "link pending udev initialization...");
return 0;
}
}
if (link->dhcp_client) {
- r = sd_dhcp_client_set_mtu(link->dhcp_client, link->mtu);
+ r = sd_dhcp_client_set_mtu(link->dhcp_client,
+ link->mtu);
if (r < 0) {
- log_warning_link(link, "Could not update MTU in DHCP client: %s",
+ log_warning_link(link,
+ "Could not update MTU in DHCP client: %s",
strerror(-r));
return r;
}
set, simply ignore them. */
r = sd_rtnl_message_read_ether_addr(m, IFLA_ADDRESS, &mac);
if (r >= 0) {
- if (memcmp(link->mac.ether_addr_octet, mac.ether_addr_octet, ETH_ALEN)) {
+ if (memcmp(link->mac.ether_addr_octet, mac.ether_addr_octet,
+ ETH_ALEN)) {
- memcpy(link->mac.ether_addr_octet, mac.ether_addr_octet, ETH_ALEN);
+ memcpy(link->mac.ether_addr_octet, mac.ether_addr_octet,
+ ETH_ALEN);
log_debug_link(link, "MAC address: "
"%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
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",
+ log_warning_link(link,
+ "Could not update MAC address in IPv4LL client: %s",
strerror(-r));
return r;
}
}
if (link->dhcp_client) {
- r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac);
+ 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",
+ log_warning_link(link,
+ "Could not update MAC address in DHCP client: %s",
strerror(-r));
return r;
}
r = sd_dhcp6_client_set_mac(link->dhcp6_client,
&link->mac);
if (r < 0) {
- log_warning_link(link, "Could not update MAC address in DHCPv6 client: %s",
+ log_warning_link(link,
+ "Could not update MAC address in DHCPv6 client: %s",
strerror(-r));
return r;
}
/* 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;
}
else
/* no useful addresses found */
link->operstate = LINK_OPERSTATE_CARRIER;
- } else
- link->operstate = LINK_OPERSTATE_UNKNOWN;
+ } else if (link->flags & IFF_UP)
+ link->operstate = LINK_OPERSTATE_NO_CARRIER;
+ else
+ link->operstate = LINK_OPERSTATE_OFF;
}
int link_save(Link *link) {
r = fopen_temporary(link->state_file, &f, &temp_path);
if (r < 0)
- goto finish;
+ return r;
fchmod(fileno(f), 0644);
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) {
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) {
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) {
+ if (space)
+ fputc(' ', f);
+ fputs(domainname, f);
+ }
+ }
fputs("\n", f);
- fprintf(f, "LLMNR=%s\n", llmnr_support_to_string(link->network->llmnr));
+ fprintf(f, "WILDCARD_DOMAIN=%s\n",
+ yes_no(link->network->wildcard_domain));
+
+ fprintf(f, "LLMNR=%s\n",
+ llmnr_support_to_string(link->network->llmnr));
}
if (link->dhcp_lease) {
r = dhcp_lease_save(link->dhcp_lease, link->lease_file);
if (r < 0)
- goto finish;
+ goto fail;
fprintf(f,
"DHCP_LEASE=%s\n",
} else
unlink(link->lease_file);
- fflush(f);
+ r = fflush_and_check(f);
+ if (r < 0)
+ goto fail;
- if (ferror(f) || rename(temp_path, link->state_file) < 0) {
+ if (rename(temp_path, link->state_file) < 0) {
r = -errno;
- unlink(link->state_file);
- unlink(temp_path);
+ goto fail;
}
-finish:
- if (r < 0)
- log_error_link(link, "Failed to save link data to %s: %s", link->state_file, strerror(-r));
-
+ return 0;
+fail:
+ log_error_link(link, "Failed to save link data to %s: %s", link->state_file, strerror(-r));
+ unlink(link->state_file);
+ unlink(temp_path);
return r;
}
static const char* const link_state_table[_LINK_STATE_MAX] = {
- [LINK_STATE_INITIALIZING] = "initializing",
+ [LINK_STATE_PENDING] = "pending",
[LINK_STATE_ENSLAVING] = "configuring",
[LINK_STATE_SETTING_ADDRESSES] = "configuring",
[LINK_STATE_SETTING_ROUTES] = "configuring",
DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState);
static const char* const link_operstate_table[_LINK_OPERSTATE_MAX] = {
- [LINK_OPERSTATE_UNKNOWN] = "unknown",
+ [LINK_OPERSTATE_OFF] = "off",
+ [LINK_OPERSTATE_NO_CARRIER] = "no-carrier",
[LINK_OPERSTATE_DORMANT] = "dormant",
[LINK_OPERSTATE_CARRIER] = "carrier",
[LINK_OPERSTATE_DEGRADED] = "degraded",