address_free(address);
}
+ while ((address = link->pool_addresses)) {
+ LIST_REMOVE(addresses, link->pool_addresses, address);
+ address_free(address);
+ }
+
sd_dhcp_client_unref(link->dhcp_client);
sd_dhcp_lease_unref(link->dhcp_lease);
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%*s: could not set route: %s",
+ "MESSAGE=%-*s: could not set route: %s",
IFNAMSIZ,
link->ifname, strerror(-r),
"ERRNO=%d", -r,
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -ESRCH)
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%*s: could not drop route: %s",
+ "MESSAGE=%-*s: could not drop route: %s",
IFNAMSIZ,
link->ifname, strerror(-r),
"ERRNO=%d", -r,
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%*s: could not set address: %s",
+ "MESSAGE=%-*s: could not set address: %s",
IFNAMSIZ,
link->ifname, strerror(-r),
"ERRNO=%d", -r,
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -ENOENT)
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%*s: could not update address: %s",
+ "MESSAGE=%-*s: could not update address: %s",
IFNAMSIZ,
link->ifname, strerror(-r),
"ERRNO=%d", -r,
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EADDRNOTAVAIL)
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%*s: could not drop address: %s",
+ "MESSAGE=%-*s: could not drop address: %s",
IFNAMSIZ,
link->ifname, strerror(-r),
"ERRNO=%d", -r,
r = sd_rtnl_message_get_errno(m);
if (r < 0)
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%s: could not set MTU: %s",
- link->ifname, strerror(-r),
+ "MESSAGE=%-*s: could not set MTU: %s",
+ IFNAMSIZ, link->ifname, strerror(-r),
"ERRNO=%d", -r,
NULL);
if (r >= 0)
log_struct_link(LOG_INFO, link,
- "MESSAGE=%*s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
+ "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
IFNAMSIZ,
link->ifname,
ADDRESS_FMT_VAL(address),
NULL);
else
log_struct_link(LOG_INFO, link,
- "MESSAGE=%*s: DHCPv4 address %u.%u.%u.%u/%u",
+ "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u",
IFNAMSIZ,
link->ifname,
ADDRESS_FMT_VAL(address),
return r;
log_struct_link(LOG_INFO, link,
- "MESSAGE=%*s: IPv4 link-local address %u.%u.%u.%u",
+ "MESSAGE=%-*s: IPv4 link-local address %u.%u.%u.%u",
IFNAMSIZ,
link->ifname,
ADDRESS_FMT_VAL(address),
/* 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",
+ "MESSAGE=%-*s: could not bring up interface: %s",
IFNAMSIZ,
link->ifname, strerror(-r),
"ERRNO=%d", -r,
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
log_struct_link(LOG_ERR, link,
- "MESSAGE=%*s: could not enslave: %s",
+ "MESSAGE=%-*s: could not enslave: %s",
IFNAMSIZ,
link->ifname, strerror(-r),
"ERRNO=%d", -r,
}
static int link_enter_enslave(Link *link) {
- NetDev *vlan, *macvlan;
+ NetDev *vlan, *macvlan, *vxlan;
Iterator i;
int r;
!link->network->bond &&
!link->network->tunnel &&
hashmap_isempty(link->network->vlans) &&
- hashmap_isempty(link->network->macvlans))
+ hashmap_isempty(link->network->macvlans) &&
+ hashmap_isempty(link->network->vxlans))
return link_enslaved(link);
if (link->network->bond) {
log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%*s: enslaving by '%s'",
+ "MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, link->network->bond->ifname,
NETDEV(link->network->bond),
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",
+ "MESSAGE=%-*s: could not enslave by '%s': %s",
IFNAMSIZ,
link->ifname, link->network->bond->ifname, strerror(-r),
NETDEV(link->network->bond),
if (link->network->bridge) {
log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%*s: enslaving by '%s'",
+ "MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, link->network->bridge->ifname,
NETDEV(link->network->bridge),
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",
+ "MESSAGE=%-*s: could not enslave by '%s': %s",
IFNAMSIZ,
link->ifname, link->network->bridge->ifname, strerror(-r),
NETDEV(link->network->bridge),
if (link->network->tunnel) {
log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%*s: enslaving by '%s'",
+ "MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, link->network->tunnel->ifname,
NETDEV(link->network->tunnel),
r = netdev_enslave(link->network->tunnel, link, &enslave_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%*s: could not enslave by '%s': %s",
+ "MESSAGE=%-*s: could not enslave by '%s': %s",
IFNAMSIZ,
link->ifname, link->network->tunnel->ifname, strerror(-r),
NETDEV(link->network->tunnel),
HASHMAP_FOREACH(vlan, link->network->vlans, i) {
log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%*s: enslaving by '%s'",
+ "MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, vlan->ifname, NETDEV(vlan), NULL);
r = netdev_enslave(vlan, link, &enslave_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%*s: could not enslave by '%s': %s",
+ "MESSAGE=%-*s: could not enslave by '%s': %s",
IFNAMSIZ,
link->ifname, vlan->ifname, strerror(-r),
NETDEV(vlan), NULL);
HASHMAP_FOREACH(macvlan, link->network->macvlans, i) {
log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%*s: enslaving by '%s'",
+ "MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, macvlan->ifname, NETDEV(macvlan), NULL);
r = netdev_enslave(macvlan, link, &enslave_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%*s: could not enslave by '%s': %s",
+ "MESSAGE=%-*s: could not enslave by '%s': %s",
IFNAMSIZ,
link->ifname, macvlan->ifname, strerror(-r),
NETDEV(macvlan), NULL);
link->enslaving ++;
}
+ HASHMAP_FOREACH(vxlan, link->network->vxlans, i) {
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%*s: enslaving by '%s'",
+ IFNAMSIZ,
+ link->ifname, vxlan->ifname, NETDEV(vxlan), NULL);
+
+ r = netdev_enslave(vxlan, link, &enslave_handler);
+ if (r < 0) {
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%*s: could not enslave by '%s': %s",
+ IFNAMSIZ,
+ link->ifname, vxlan->ifname, strerror(-r),
+ NETDEV(vxlan), NULL);
+ link_enter_failed(link);
+ return r;
+ }
+
+ link_ref(link);
+ link->enslaving ++;
+ }
+
return 0;
}
pool_start.s_addr = htobe32(be32toh(address->in_addr.in.s_addr) + 1);
r = sd_dhcp_server_set_lease_pool(link->dhcp_server,
&pool_start, 32);
+ if (r < 0)
+ return r;
break;
}
*/
}
- if (link_has_carrier(link->flags, link->operstate)) {
+ if (link_has_carrier(link->flags, link->kernel_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) {
+static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+ Link *link = userdata;
Network *network;
int r;
if (link->state != LINK_STATE_INITIALIZING)
return 0;
- if (device)
- link->udev_device = udev_device_ref(device);
-
- log_debug_link(link, "udev initialized link");
+ log_debug_link(link, "link state is up-to-date");
- r = network_get(link->manager, 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 0;
return 0;
}
+int link_initialized(Link *link, struct udev_device *device) {
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ int r;
+
+ assert(link);
+ assert(link->manager);
+ assert(link->manager->rtnl);
+ assert(device);
+
+ if (link->state != LINK_STATE_INITIALIZING)
+ return 0;
+
+ log_debug_link(link, "udev initialized link");
+
+ 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 */
+
+ 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);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
Manager *m = userdata;
Link *link = NULL;
log_debug_link(link, "udev initializing link...");
return 0;
}
- }
- r = link_initialized(link, device);
- if (r < 0)
- return r;
+ r = link_initialized(link, device);
+ if (r < 0)
+ return r;
+ } else {
+ r = link_initialized_and_synced(m->rtnl, NULL, link);
+ if (r < 0)
+ return r;
+ }
return 0;
}
}
if (link->dhcp_lease) {
+ assert(link->network);
+
r = dhcp_lease_save(link->dhcp_lease, link->lease_file);
if (r < 0)
goto finish;