}
static void link_free(Link *link) {
+ Address *address;
+
if (!link)
return;
assert(link->manager);
+ while ((address = link->addresses)) {
+ LIST_REMOVE(addresses, link->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,
NULL);
log_debug_link(link, "setting routes");
- LIST_FOREACH(static_routes, rt, link->network->static_routes) {
+ LIST_FOREACH(routes, rt, link->network->static_routes) {
r = route_configure(rt, link, &route_handler);
if (r < 0) {
log_warning_link(link,
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,
NULL);
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,
NULL);
log_debug_link(link, "setting addresses");
- LIST_FOREACH(static_addresses, ad, link->network->static_addresses) {
+ LIST_FOREACH(addresses, ad, link->network->static_addresses) {
r = address_configure(ad, link, &address_handler);
if (r < 0) {
log_warning_link(link,
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,
NULL);
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,
NULL);
r = sd_bus_message_get_errno(m);
if (r < 0)
- log_warning("Could not set hostname: %s", strerror(-r));
+ log_warning_link(link, "Could not set hostname: %s", strerror(-r));
link_unref(link);
if (r < 0)
return r;
- r = sd_bus_call_async(link->manager->bus, m, set_hostname_handler, link, 0, NULL);
+ 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));
if (r >= 0 && hostname) {
r = link_set_hostname(link, "");
if (r < 0)
- log_error("Failed to reset transient hostname");
+ log_error_link(link, "Failed to reset transient hostname");
}
}
struct in_addr netmask;
struct in_addr gateway;
unsigned prefixlen;
- struct in_addr *nameservers;
- size_t nameservers_size;
int r;
assert(client);
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),
prefixlen,
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),
prefixlen,
link->dhcp_lease = lease;
- if (link->network->dhcp_dns) {
- r = sd_dhcp_lease_get_dns(lease, &nameservers, &nameservers_size);
- if (r >= 0) {
- r = manager_update_resolv_conf(link->manager);
- if (r < 0)
- log_error("Failed to update resolv.conf");
- }
- }
-
if (link->network->dhcp_mtu) {
uint16_t mtu;
if (r >= 0) {
r = link_set_hostname(link, hostname);
if (r < 0)
- log_error("Failed to set transient hostname "
+ log_error_link(link, "Failed to set transient hostname "
"to '%s'", hostname);
}
}
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),
NULL);
/* 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,
NULL);
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,
NULL);
link_save(link);
- if (!link->network->bridge && !link->network->bond &&
+ if (!link->network->bridge &&
+ !link->network->bond &&
+ !link->network->tunnel &&
hashmap_isempty(link->network->vlans) &&
hashmap_isempty(link->network->macvlans))
return link_enslaved(link);
if (link->network->bond) {
log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%s: enslaving by '%s'",
- link->ifname, link->network->bond->name,
+ "MESSAGE=%*s: enslaving by '%s'",
+ IFNAMSIZ,
+ link->ifname, link->network->bond->ifname,
NETDEV(link->network->bond),
NULL);
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->bond->name, strerror(-r),
+ "MESSAGE=%*s: could not enslave by '%s': %s",
+ IFNAMSIZ,
+ link->ifname, link->network->bond->ifname, strerror(-r),
NETDEV(link->network->bond),
NULL);
link_enter_failed(link);
if (link->network->bridge) {
log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%s: enslaving by '%s'",
- link->ifname, link->network->bridge->name,
+ "MESSAGE=%*s: enslaving by '%s'",
+ IFNAMSIZ,
+ link->ifname, link->network->bridge->ifname,
NETDEV(link->network->bridge),
NULL);
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->bridge->name, strerror(-r),
+ "MESSAGE=%*s: could not enslave by '%s': %s",
+ IFNAMSIZ,
+ link->ifname, link->network->bridge->ifname, strerror(-r),
NETDEV(link->network->bridge),
NULL);
link_enter_failed(link);
link->enslaving ++;
}
+ if (link->network->tunnel) {
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%*s: enslaving by '%s'",
+ IFNAMSIZ,
+ link->ifname, link->network->tunnel->ifname,
+ NETDEV(link->network->tunnel),
+ NULL);
+
+ 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",
+ IFNAMSIZ,
+ link->ifname, link->network->tunnel->ifname, strerror(-r),
+ NETDEV(link->network->tunnel),
+ NULL);
+ link_enter_failed(link);
+ return r;
+ }
+
+ link_ref(link);
+ link->enslaving ++;
+ }
+
HASHMAP_FOREACH(vlan, link->network->vlans, i) {
log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%s: enslaving by '%s'",
- link->ifname, vlan->name, NETDEV(vlan), NULL);
+ "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",
- link->ifname, vlan->name, strerror(-r),
+ "MESSAGE=%*s: could not enslave by '%s': %s",
+ IFNAMSIZ,
+ link->ifname, vlan->ifname, strerror(-r),
NETDEV(vlan), NULL);
link_enter_failed(link);
return r;
HASHMAP_FOREACH(macvlan, link->network->macvlans, i) {
log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%s: enslaving by '%s'",
- link->ifname, macvlan->name, NETDEV(macvlan), NULL);
+ "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",
- link->ifname, macvlan->name, strerror(-r),
+ "MESSAGE=%*s: could not enslave by '%s': %s",
+ IFNAMSIZ,
+ link->ifname, macvlan->ifname, strerror(-r),
NETDEV(macvlan), NULL);
link_enter_failed(link);
return r;
if (device)
link->udev_device = udev_device_ref(device);
- log_debug_link(link, "link initialized");
+ log_debug_link(link, "udev initialized link");
r = network_get(link->manager, device, link->ifname, &link->mac, &network);
if (r == -ENOENT) {
Link *link = NULL;
uint16_t type;
_cleanup_address_free_ Address *address = NULL;
+ Address *ad;
char buf[INET6_ADDRSTRLEN];
+ bool address_dropped = false;
int r, ifindex;
assert(rtnl);
r = sd_rtnl_message_addr_get_ifindex(message, &ifindex);
if (r < 0 || ifindex <= 0) {
- log_warning("rtnl: received address message without valid ifindix, ignoring");
+ log_warning("rtnl: received address message without valid ifindex, ignoring");
return 0;
} else {
r = link_get(m, ifindex, &link);
if (r < 0 || !link) {
- log_warning("rtnl: received address for non-existing link, ignoring");
+ log_warning("rtnl: received address for a nonexistent link, ignoring");
return 0;
}
}
r = sd_rtnl_message_addr_get_family(message, &address->family);
if (r < 0 || !IN_SET(address->family, AF_INET, AF_INET6)) {
- log_warning("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("rtnl: recevied address with invalid prefixlen, ignoring");
+ log_warning_link(link, "rtnl: recevied address with invalid prefixlen, ignoring");
return 0;
}
case AF_INET:
r = sd_rtnl_message_read_in_addr(message, IFA_LOCAL, &address->in_addr.in);
if (r < 0) {
- log_warning("rtnl: received address without valid address, ignoring");
+ log_warning_link(link, "rtnl: received address without valid address, ignoring");
return 0;
}
case AF_INET6:
r = sd_rtnl_message_read_in6_addr(message, IFA_ADDRESS, &address->in_addr.in6);
if (r < 0) {
- log_warning("rtnl: received address without valid address, ignoring");
+ log_warning_link(link, "rtnl: received address without valid address, ignoring");
return 0;
}
}
if (!inet_ntop(address->family, &address->in_addr, buf, INET6_ADDRSTRLEN)) {
- log_warning("could not print address");
+ log_warning_link(link, "could not print address");
return 0;
}
+ LIST_FOREACH(addresses, ad, link->addresses) {
+ if (address_equal(ad, address)) {
+ LIST_REMOVE(addresses, link->addresses, ad);
+
+ address_free(ad);
+
+ address_dropped = true;
+
+ break;
+ }
+ }
+
switch (type) {
case RTM_NEWADDR:
- log_info("added address: %s/%u to ifindex %d", buf,
- address->prefixlen, ifindex);
- break;
+ if (!address_dropped)
+ log_debug_link(link, "added address: %s/%u", buf,
+ address->prefixlen);
+
+ LIST_PREPEND(addresses, link->addresses, address);
+ address = NULL;
+ break;
case RTM_DELADDR:
- log_info("removed address: %s/%u from ifindex %d", buf,
- address->prefixlen, ifindex);
+ if (address_dropped)
+ log_debug_link(link, "removed address: %s/%u", buf,
+ address->prefixlen);
+
break;
default:
assert_not_reached("Received invalid RTNL message type");
link = *ret;
- log_debug_link(link, "link added");
+ log_debug_link(link, "link %"PRIu64" added", link->ifindex);
r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, link->ifindex, 0);
if (r < 0)
return -errno;
}
- if (udev_device_get_is_initialized(device) <= 0)
+ if (udev_device_get_is_initialized(device) <= 0) {
/* not yet ready */
+ log_debug_link(link, "udev initializing link...");
return 0;
+ }
}
r = link_initialized(link, device);
return link_update_flags(link, m);
}
+static void serialize_addresses(FILE *f, const char *key, Address *address) {
+ Address *ad;
+
+ assert(f);
+ assert(key);
+
+ if (!address)
+ return;
+
+ fprintf(f, "%s=", key);
+
+ LIST_FOREACH(addresses, ad, address) {
+ char buf[INET6_ADDRSTRLEN];
+
+ if (inet_ntop(address->family, &address->in_addr, buf, INET6_ADDRSTRLEN))
+ fprintf(f, "%s%s", buf, (ad->addresses_next) ? " ": "");
+ }
+
+ fputs("\n", f);
+}
+
int link_save(Link *link) {
_cleanup_free_ char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
"FLAGS=%u\n",
admin_state, oper_state, link->flags);
+ if (link->network)
+ serialize_addresses(f, "DNS", link->network->dns);
+
if (link->dhcp_lease) {
r = dhcp_lease_save(link->dhcp_lease, link->lease_file);
if (r < 0)
goto finish;
- fprintf(f, "DHCP_LEASE=%s\n", link->lease_file);
+ fprintf(f,
+ "DHCP_LEASE=%s\n"
+ "DHCP_USE_DNS=%s\n",
+ link->lease_file, yes_no(link->network->dhcp_dns));
} else
unlink(link->lease_file);
finish:
if (r < 0)
- log_error("Failed to save link data to %s: %s", link->state_file, strerror(-r));
+ log_error_link(link, "Failed to save link data to %s: %s", link->state_file, strerror(-r));
return r;
}
~ianmdlvl / elogind.git / blobdiff