#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;
link_save(link);
}
+static int link_stop_clients(Link *link) {
+ int r = 0, k;
+
+ assert(link);
+ assert(link->manager);
+ assert(link->manager->event);
+
+ if (!link->network)
+ return 0;
+
+ if (link->network->dhcp) {
+ assert(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));
+ r = k;
+ }
+ }
+
+ if (link->network->ipv4ll) {
+ assert(link->ipv4ll);
+
+ k = sd_ipv4ll_stop(link->ipv4ll);
+ if (k < 0) {
+ log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r));
+ r = k;
+ }
+ }
+
+ return r;
+}
+
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;
+ link_stop_clients(link);
+
link_save(link);
}
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;
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;
-
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) {
log_struct_link(LOG_WARNING, link,
"MESSAGE=%s: could not bring up interface: %s",
link->ifname, strerror(-r),
"ERRNO=%d", -r,
NULL);
+ link_enter_failed(link);
+ }
+
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