#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 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)
+ return;
+
log_warning_link(link, "failed");
link->state = LINK_STATE_FAILED;
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->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->route_messages ++;
}
+ }
- link->route_messages ++;
+ if (link->route_messages == 0) {
+ link_enter_configured(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);
+ }
- 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);
+ }
}
+ 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;
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;
log_debug_link(link, "acquiring IPv4 link-local address");
r = sd_ipv4ll_start(link->ipv4ll);
- if (r < 0)
+ if (r < 0) {
+ log_warning_link(link, "could not acquire IPv4 "
+ "link-local address");
return r;
+ }
}
if (link->network->dhcp) {
log_debug_link(link, "acquiring DHCPv4 lease");
r = sd_dhcp_client_start(link->dhcp_client);
- if (r < 0)
+ if (r < 0) {
+ log_warning_link(link, "could not acquire DHCPv4 "
+ "lease");
return r;
+ }
}
return 0;
}
-static int link_update_flags(Link *link, unsigned flags) {
- unsigned flags_added, flags_removed, generic_flags;
- bool carrier_gained, carrier_lost;
+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;
- if (link->flags == flags)
+ 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) && (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;
+
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;
}
}
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);
+ }
+
return 1;
}
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;
}
}
- 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) {
~ianmdlvl / elogind.git / blobdiff