#include "bus-util.h"
#include "network-internal.h"
+#include "network-util.h"
#include "dhcp-lease-internal.h"
static int ipv4ll_address_update(Link *link, bool deprecate);
static bool ipv4ll_is_bound(sd_ipv4ll *ll);
static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
- _cleanup_link_free_ Link *link = NULL;
+ _cleanup_link_unref_ Link *link = NULL;
uint16_t type;
char *ifname;
int r, ifindex;
if (!link)
return -ENOMEM;
+ link->n_ref = 1;
link->manager = manager;
link->state = LINK_STATE_INITIALIZING;
link->ifindex = ifindex;
if (r < 0)
return -ENOMEM;
+ r = asprintf(&link->lease_file, "/run/systemd/network/leases/%"PRIu64,
+ link->ifindex);
+ if (r < 0)
+ return -ENOMEM;
+
r = hashmap_put(manager->links, &link->ifindex, link);
if (r < 0)
return r;
return 0;
}
-void link_free(Link *link) {
+static void link_free(Link *link) {
if (!link)
return;
sd_dhcp_client_unref(link->dhcp_client);
sd_dhcp_lease_unref(link->dhcp_lease);
+ unlink(link->lease_file);
+ free(link->lease_file);
+
sd_ipv4ll_unref(link->ipv4ll);
hashmap_remove(link->manager->links, &link->ifindex);
free(link->ifname);
+
+ unlink(link->state_file);
free(link->state_file);
udev_device_unref(link->udev_device);
free(link);
}
+Link *link_unref(Link *link) {
+ if (link && (-- link->n_ref <= 0))
+ link_free(link);
+
+ return NULL;
+}
+
+Link *link_ref(Link *link) {
+ if (link)
+ assert_se(++ link->n_ref >= 2);
+
+ return link;
+}
+
int link_get(Manager *m, int ifindex, Link **ret) {
Link *link;
uint64_t ifindex_64;
return 0;
}
+void link_drop(Link *link) {
+ if (!link || link->state == LINK_STATE_LINGER)
+ return;
+
+ link->state = LINK_STATE_LINGER;
+
+ log_debug_link(link, "link removed");
+
+ link_unref(link);
+
+ return;
+}
+
static int link_enter_configured(Link *link) {
assert(link);
assert(link->state == LINK_STATE_SETTING_ROUTES);
static void link_enter_unmanaged(Link *link) {
assert(link);
- log_info_link(link, "unmanaged");
+ log_debug_link(link, "unmanaged");
link->state = LINK_STATE_UNMANAGED;
static void link_enter_failed(Link *link) {
assert(link);
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return;
log_warning_link(link, "failed");
int r;
assert(link->route_messages > 0);
- assert(link->state == LINK_STATE_SETTING_ADDRESSES ||
- link->state == LINK_STATE_SETTING_ROUTES ||
- link->state == LINK_STATE_FAILED);
+ assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES,
+ LINK_STATE_SETTING_ROUTES, LINK_STATE_FAILED,
+ LINK_STATE_LINGER));
link->route_messages --;
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(LINK_STATE_FAILED, LINK_STATE_LINGER)) {
+ link_unref(link);
return 1;
+ }
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
link_enter_configured(link);
}
+ link_unref(link);
+
return 1;
}
link->state = LINK_STATE_SETTING_ROUTES;
if (!link->network->static_routes && !link->dhcp_lease &&
- (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false))
+ (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false))
return link_enter_configured(link);
log_debug_link(link, "setting routes");
return r;
}
+ link_ref(link);
link->route_messages ++;
}
return r;
}
+ link_ref(link);
link->route_messages ++;
}
}
struct in_addr gateway;
r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway);
- if (r < 0) {
- log_warning_link(link, "DHCP error: no router: %s",
- strerror(-r));
+ if (r < 0 && r != -ENOENT) {
+ log_warning_link(link, "DHCP error: %s", strerror(-r));
return r;
}
- r = route_new_dynamic(&route);
- if (r < 0) {
- log_error_link(link, "Could not allocate route: %s",
- strerror(-r));
- return r;
- }
+ if (r >= 0) {
+ r = route_new_dynamic(&route);
+ if (r < 0) {
+ log_error_link(link, "Could not allocate route: %s",
+ strerror(-r));
+ return r;
+ }
- r = route_new_dynamic(&route_gw);
- if (r < 0) {
- log_error_link(link, "Could not allocate route: %s",
- strerror(-r));
- return r;
- }
+ r = route_new_dynamic(&route_gw);
+ 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;
+ /* 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;
- 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;
- }
+ 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 ++;
+ link_ref(link);
+ link->route_messages ++;
- route->family = AF_INET;
- route->in_addr.in = gateway;
+ route->family = AF_INET;
+ route->in_addr.in = gateway;
- 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;
+ 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_ref(link);
+ link->route_messages ++;
}
+ }
- link->route_messages ++;
+ if (link->route_messages == 0) {
+ link_enter_configured(link);
}
return 0;
assert(link);
assert(link->ifname);
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) {
+ link_unref(link);
return 1;
+ }
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -ENOENT)
"ERRNO=%d", -r,
NULL);
+ link_unref(link);
+
return 0;
}
assert(link);
assert(link->ifname);
assert(link->addr_messages > 0);
- assert(link->state == LINK_STATE_SETTING_ADDRESSES || link->state == LINK_STATE_FAILED);
+ assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES,
+ LINK_STATE_FAILED, LINK_STATE_LINGER));
link->addr_messages --;
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) {
+ link_unref(link);
return 1;
+ }
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
link_enter_set_routes(link);
}
+ link_unref(link);
+
return 1;
}
return r;
}
+ link_ref(link);
link->addr_messages ++;
}
return r;
}
+ link_ref(link);
link->addr_messages ++;
}
}
return r;
}
+ link_ref(link);
link->addr_messages ++;
}
assert(link);
assert(link->ifname);
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) {
+ link_unref(link);
return 1;
+ }
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -ENOENT)
"ERRNO=%d", -r,
NULL);
+ link_unref(link);
+
return 0;
}
assert(link);
assert(link->ifname);
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) {
+ link_unref(link);
return 1;
+ }
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -ENOENT)
"ERRNO=%d", -r,
NULL);
+ link_unref(link);
+
return 0;
}
static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
+ Link *link = userdata;
int r;
+ assert(link);
+
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) {
+ link_unref(link);
+ return 1;
+ }
+
r = sd_bus_message_get_errno(m);
if (r < 0)
log_warning("Could not set hostname: %s", strerror(-r));
+ link_unref(link);
+
return 1;
}
-static int set_hostname(sd_bus *bus, const char *hostname) {
+static int link_set_hostname(Link *link, const char *hostname) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r = 0;
+ assert(link);
+ assert(link->manager);
assert(hostname);
- log_debug("Setting transient hostname: '%s'", hostname);
+ log_debug_link(link, "Setting transient hostname: '%s'", hostname);
- if (!bus) { /* TODO: replace by assert when we can rely on kdbus */
- log_info("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;
}
r = sd_bus_message_new_method_call(
- bus,
+ link->manager->bus,
&m,
"org.freedesktop.hostname1",
"/org/freedesktop/hostname1",
if (r < 0)
return r;
- r = sd_bus_call_async(bus, m, set_hostname_handler, NULL, 0, NULL);
+ r = sd_bus_call_async(link->manager->bus, m, set_hostname_handler, link, 0, NULL);
if (r < 0)
- log_error("Could not set transient hostname: %s", strerror(-r));
+ log_error_link(link, "Could not set transient hostname: %s", strerror(-r));
+
+ link_ref(link);
return r;
}
assert(link);
assert(link->ifname);
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) {
+ link_unref(link);
return 1;
+ }
r = sd_rtnl_message_get_errno(m);
if (r < 0)
"ERRNO=%d", -r,
NULL);
+ link_unref(link);
+
return 1;
}
return r;
}
+ link_unref(link);
+
return 0;
}
r = address_new_dynamic(&address);
if (r >= 0) {
- sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
- sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
- sd_dhcp_lease_get_router(link->dhcp_lease, &gateway);
- prefixlen = net_netmask_to_prefixlen(&netmask);
-
- r = route_new_dynamic(&route_gw);
+ r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway);
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;
+ r = route_new_dynamic(&route_gw);
+ 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);
- }
+ route_drop(route_gw, link, &route_drop_handler);
+ link_ref(link);
+ }
- r = route_new_dynamic(&route);
- if (r >= 0) {
- route->family = AF_INET;
- route->in_addr.in = gateway;
+ r = route_new_dynamic(&route);
+ if (r >= 0) {
+ route->family = AF_INET;
+ route->in_addr.in = gateway;
- route_drop(route, link, &route_drop_handler);
+ route_drop(route, link, &route_drop_handler);
+ link_ref(link);
+ }
}
+ sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
+ sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
+ prefixlen = net_netmask_to_prefixlen(&netmask);
+
address->family = AF_INET;
address->in_addr.in = addr;
address->prefixlen = prefixlen;
address_drop(address, link, &address_drop_handler);
+ link_ref(link);
}
if (link->network->dhcp_mtu) {
r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname);
if (r >= 0 && hostname) {
- r = set_hostname(link->manager->bus, "");
+ r = link_set_hostname(link, "");
if (r < 0)
log_error("Failed to reset transient hostname");
}
prefixlen = net_netmask_to_prefixlen(&netmask);
r = sd_dhcp_lease_get_router(lease, &gateway);
- if (r < 0) {
- log_warning_link(link, "DHCP error: no router: %s",
- strerror(-r));
+ if (r < 0 && r != -ENOENT) {
+ log_warning_link(link, "DHCP error: %s", strerror(-r));
return r;
}
- log_struct_link(LOG_INFO, link,
- "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
- 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);
+ if (r >= 0)
+ log_struct_link(LOG_INFO, link,
+ "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
+ 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",
+ link->ifname,
+ ADDRESS_FMT_VAL(address),
+ prefixlen,
+ "ADDRESS=%u.%u.%u.%u",
+ ADDRESS_FMT_VAL(address),
+ "PREFIXLEN=%u",
+ prefixlen,
+ NULL);
link->dhcp_lease = lease;
r = sd_dhcp_lease_get_hostname(lease, &hostname);
if (r >= 0) {
- r = set_hostname(link->manager->bus, hostname);
+ r = link_set_hostname(link, hostname);
if (r < 0)
log_error("Failed to set transient hostname "
"to '%s'", hostname);
assert(link->network);
assert(link->manager);
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return;
switch (event) {
address->broadcast.s_addr = address->in_addr.in.s_addr | htonl(0xfffffffflu >> address->prefixlen);
address_update(address, link, &address_update_handler);
+ link_ref(link);
}
return 0;
address->scope = RT_SCOPE_LINK;
address_drop(address, link, &address_drop_handler);
+ link_ref(link);
r = route_new_dynamic(&route);
if (r < 0) {
route->metrics = 99;
route_drop(route, link, &route_drop_handler);
+ link_ref(link);
}
return 0;
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:
return 0;
}
-static int link_update_flags(Link *link, unsigned flags) {
- unsigned flags_added, flags_removed, generic_flags;
- bool carrier_gained, carrier_lost;
+bool link_has_carrier(unsigned flags, uint8_t operstate) {
+ /* see Documentation/networking/operstates.txt in the kernel sources */
+
+ if (operstate == IF_OPER_UP)
+ return true;
+
+ if (operstate == IF_OPER_UNKNOWN)
+ /* operstate may not be implemented, so fall back to flags */
+ if ((flags & IFF_LOWER_UP) && !(flags & IFF_DORMANT))
+ return true;
+
+ return false;
+}
+
+static int link_update_flags(Link *link, sd_rtnl_message *m) {
+ unsigned flags, flags_added, flags_removed, generic_flags;
+ uint8_t operstate;
+ bool carrier_gained = false, carrier_lost = false;
int r;
assert(link);
- if (link->state == LINK_STATE_FAILED)
- return 0;
+ r = sd_rtnl_message_link_get_flags(m, &flags);
+ if (r < 0) {
+ log_warning_link(link, "Could not get link flags");
+ return r;
+ }
+
+ r = sd_rtnl_message_read_u8(m, IFLA_OPERSTATE, &operstate);
+ if (r < 0)
+ /* if we got a message without operstate, take it to mean
+ the state was unchanged */
+ operstate = link->operstate;
- if (link->flags == flags)
+ if ((link->flags == flags) && (link->operstate == operstate))
return 0;
flags_added = (link->flags ^ flags) & flags;
flags_removed = (link->flags ^ flags) & link->flags;
generic_flags = ~(IFF_UP | IFF_LOWER_UP | IFF_DORMANT | IFF_DEBUG |
IFF_MULTICAST | IFF_BROADCAST | IFF_PROMISC |
- IFF_NOARP | IFF_MASTER | IFF_SLAVE);
-
- /* consider link to have carrier when LOWER_UP and !DORMANT
-
- TODO: use proper operstates once we start supporting 802.1X
-
- see Documentation/networking/operstates.txt in the kernel sources
- */
- carrier_gained = (((flags_added & IFF_LOWER_UP) && !(flags & IFF_DORMANT)) ||
- ((flags_removed & IFF_DORMANT) && (flags & IFF_LOWER_UP)));
- carrier_lost = ((link->flags & IFF_LOWER_UP) && !(link->flags & IFF_DORMANT)) &&
- ((flags_removed & IFF_LOWER_UP) || (flags_added & IFF_DORMANT));
-
- link->flags = flags;
-
- if (!link->network)
- /* not currently managing this link
- we track state changes, but don't log them
- they will be logged if and when a network is
- applied */
- return 0;
+ IFF_NOARP | IFF_MASTER | IFF_SLAVE | IFF_RUNNING);
if (flags_added & IFF_UP)
- log_info_link(link, "link is up");
+ log_debug_link(link, "link is up");
else if (flags_removed & IFF_UP)
- log_info_link(link, "link is down");
+ log_debug_link(link, "link is down");
if (flags_added & IFF_LOWER_UP)
log_debug_link(link, "link is lower up");
log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)",
flags_removed & generic_flags);
+ carrier_gained = !link_has_carrier(link->flags, link->operstate) &&
+ link_has_carrier(flags, operstate);
+ carrier_lost = link_has_carrier(link->flags, link->operstate) &&
+ !link_has_carrier(flags, operstate);
+
+ link->flags = flags;
+ link->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->dhcp || link->network->ipv4ll) {
+ if (link->network) {
r = link_acquire_conf(link);
if (r < 0) {
- log_warning_link(link, "Could not acquire configuration: %s", strerror(-r));
link_enter_failed(link);
return r;
}
} else if (carrier_lost) {
log_info_link(link, "lost carrier");
- if (link->network->dhcp) {
- r = sd_dhcp_client_stop(link->dhcp_client);
- if (r < 0) {
- log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r));
- link_enter_failed(link);
- return r;
- }
- }
-
- if (link->network->ipv4ll) {
- r = sd_ipv4ll_stop(link->ipv4ll);
- if (r < 0) {
- log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r));
- link_enter_failed(link);
- return r;
- }
+ r = link_stop_clients(link);
+ if (r < 0) {
+ link_enter_failed(link);
+ return r;
}
}
assert(link);
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) {
+ link_unref(link);
return 1;
+ }
r = sd_rtnl_message_get_errno(m);
- if (r >= 0)
- link_update_flags(link, link->flags | IFF_UP);
- else
+ if (r < 0) {
+ /* 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",
link->ifname, strerror(-r),
"ERRNO=%d", -r,
NULL);
+ }
+
+ link_unref(link);
+
return 1;
}
return r;
}
+ link_ref(link);
+
return 0;
}
int r;
assert(link);
- assert(link->state == LINK_STATE_ENSLAVING || link->state == LINK_STATE_FAILED);
+ assert(IN_SET(link->state, LINK_STATE_ENSLAVING, LINK_STATE_FAILED,
+ LINK_STATE_LINGER));
assert(link->network);
link->enslaving --;
- if (link->state == LINK_STATE_FAILED)
+ if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) {
+ link_unref(link);
return 1;
+ }
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
"ERRNO=%d", -r,
NULL);
link_enter_failed(link);
+ link_unref(link);
return 1;
}
if (link->enslaving == 0)
link_enslaved(link);
+ link_unref(link);
+
return 1;
}
hashmap_isempty(link->network->macvlans))
return link_enslaved(link);
- if (link->network->bridge) {
+ if (link->network->bond) {
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%s: enslaving by '%s'",
- link->ifname, link->network->bridge->name,
- NETDEV(link->network->bridge),
+ link->ifname, link->network->bond->name,
+ NETDEV(link->network->bond),
NULL);
- r = netdev_enslave(link->network->bridge, link, &enslave_handler);
+ 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",
- link->ifname, link->network->bridge->name, strerror(-r),
- NETDEV(link->network->bridge),
+ link->ifname, link->network->bond->name, strerror(-r),
+ NETDEV(link->network->bond),
NULL);
link_enter_failed(link);
return r;
}
+ link_ref(link);
link->enslaving ++;
}
- if (link->network->bond) {
+ if (link->network->bridge) {
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%s: enslaving by '%s'",
- link->ifname, link->network->bond->name,
- NETDEV(link->network->bond),
+ link->ifname, link->network->bridge->name,
+ NETDEV(link->network->bridge),
NULL);
- r = netdev_enslave(link->network->bond, link, &enslave_handler);
+ 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",
- link->ifname, link->network->bond->name, strerror(-r),
- NETDEV(link->network->bond),
+ link->ifname, link->network->bridge->name, strerror(-r),
+ NETDEV(link->network->bridge),
NULL);
link_enter_failed(link);
return r;
}
+ link_ref(link);
link->enslaving ++;
}
return r;
}
+ link_ref(link);
link->enslaving ++;
}
return r;
}
+ link_ref(link);
link->enslaving ++;
}
if (link->network->ipv4ll) {
uint8_t seed[8];
+
r = sd_ipv4ll_new(&link->ipv4ll);
if (r < 0)
return r;
}
}
+ if (link_has_carrier(link->flags, link->operstate)) {
+ r = link_acquire_conf(link);
+ if (r < 0)
+ return r;
+ }
+
return link_enter_enslave(link);
}
int link_initialized(Link *link, struct udev_device *device) {
Network *network;
- unsigned flags;
int r;
assert(link);
if (r < 0)
return r;
- /* re-trigger all state updates */
- flags = link->flags;
- link->flags = 0;
- r = link_update_flags(link, flags);
- if (r < 0)
- return r;
-
return 0;
}
link = *ret;
- log_info_link(link, "link added");
+ log_debug_link(link, "link added");
if (detect_container(NULL) <= 0) {
/* not in a container, udev will be around */
}
int link_update(Link *link, sd_rtnl_message *m) {
- unsigned flags;
struct ether_addr mac;
char *ifname;
int r;
assert(link->ifname);
assert(m);
- if (link->state == LINK_STATE_FAILED || link->state == LINK_STATE_UNMANAGED)
- return 0;
+ if (link->state == LINK_STATE_LINGER) {
+ link_ref(link);
+ log_info_link(link, "link readded");
+ link->state = LINK_STATE_ENSLAVING;
+ }
r = sd_rtnl_message_read_string(m, IFLA_IFNAME, &ifname);
if (r >= 0 && !streq(ifname, link->ifname)) {
}
}
- r = sd_rtnl_message_link_get_flags(m, &flags);
- if (r < 0) {
- log_warning_link(link, "Could not get link flags");
- return r;
- }
-
- return link_update_flags(link, flags);
+ return link_update_flags(link, m);
}
int link_save(Link *link) {
_cleanup_free_ char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
- const char *state;
+ const char *admin_state, *oper_state = "unknown";
int r;
assert(link);
assert(link->state_file);
+ assert(link->lease_file);
+ assert(link->manager);
+
+ r = manager_save(link->manager);
+ if (r < 0)
+ return r;
+
+ if (link->state == LINK_STATE_LINGER) {
+ unlink(link->state_file);
+ return 0;
+ }
+
+ admin_state = link_state_to_string(link->state);
+ assert(admin_state);
- state = link_state_to_string(link->state);
- assert(state);
+ if (link->operstate == IF_OPER_DORMANT)
+ oper_state = "dormant";
+ else if (link_has_carrier(link->flags, link->operstate))
+ oper_state = "carrier";
r = fopen_temporary(link->state_file, &f, &temp_path);
if (r < 0)
fprintf(f,
"# This is private data. Do not parse.\n"
- "STATE=%s\n", state);
+ "ADMIN_STATE=%s\n"
+ "OPER_STATE=%s\n"
+ "FLAGS=%u\n",
+ admin_state, oper_state, link->flags);
if (link->dhcp_lease) {
- _cleanup_free_ char *lease_file = NULL;
-
- r = asprintf(&lease_file, "/run/systemd/network/leases/%"PRIu64,
- link->ifindex);
- if (r < 0)
- return -ENOMEM;
-
- r = dhcp_lease_save(link->dhcp_lease, lease_file);
+ r = dhcp_lease_save(link->dhcp_lease, link->lease_file);
if (r < 0)
goto finish;
- fprintf(f, "DHCP_LEASE=%s\n", lease_file);
- }
+ fprintf(f, "DHCP_LEASE=%s\n", link->lease_file);
+ } else
+ unlink(link->lease_file);
fflush(f);
finish:
if (r < 0)
- log_error("Failed to save link data %s: %s", link->state_file, strerror(-r));
+ log_error("Failed to save link data to %s: %s", link->state_file, strerror(-r));
return r;
}
static const char* const link_state_table[_LINK_STATE_MAX] = {
- [LINK_STATE_INITIALIZING] = "configuring",
+ [LINK_STATE_INITIALIZING] = "initializing",
[LINK_STATE_ENSLAVING] = "configuring",
[LINK_STATE_SETTING_ADDRESSES] = "configuring",
[LINK_STATE_SETTING_ROUTES] = "configuring",
[LINK_STATE_CONFIGURED] = "configured",
[LINK_STATE_UNMANAGED] = "unmanaged",
[LINK_STATE_FAILED] = "failed",
+ [LINK_STATE_LINGER] = "linger",
};
DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState);