assert(link);
assert(link->state == LINK_STATE_SETTING_ROUTES);
- log_info("%s: link configured", link->ifname);
+ log_info_link(link, "link configured");
link->state = LINK_STATE_CONFIGURED;
static void link_enter_failed(Link *link) {
assert(link);
- log_warning("%s: failed", link->ifname);
+ log_warning_link(link, "failed");
link->state = LINK_STATE_FAILED;
}
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
- log_warning("%s: could not set route: %s",
- link->ifname, strerror(-r));
+ log_warning_link(link, "could not set route: %s", strerror(-r));
/* we might have received an old reply after moving back to SETTING_ADDRESSES,
* ignore it */
if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) {
- log_debug("%s: routes set", link->ifname);
+ log_debug_link(link, "routes set");
link_enter_configured(link);
}
if (!link->network->static_routes && !link->dhcp_route)
return link_enter_configured(link);
- log_debug("%s: setting routes", link->ifname);
+ log_debug_link(link, "setting routes");
LIST_FOREACH(static_routes, route, link->network->static_routes) {
r = route_configure(route, link, &route_handler);
if (r < 0) {
- log_warning("%s: could not set routes", link->ifname);
+ log_warning_link(link,
+ "could not set routes: %s", strerror(-r));
link_enter_failed(link);
return r;
}
if (link->dhcp_route) {
r = route_configure(link->dhcp_route, link, &route_handler);
if (r < 0) {
- log_warning("%s: could not set routes", link->ifname);
+ log_warning_link(link,
+ "could not set routes: %s", strerror(-r));
link_enter_failed(link);
return r;
}
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
- log_warning("%s: could not set address: %s",
- link->ifname, strerror(-r));
+ log_struct_link(LOG_ERR, link,
+ "MESSAGE=%s: could not set address: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
if (link->addr_messages == 0) {
- log_debug("%s: addresses set", link->ifname);
+ log_debug_link(link, "addresses set");
link_enter_set_routes(link);
}
if (!link->network->static_addresses && !link->dhcp_address)
return link_enter_set_routes(link);
- log_debug("%s: setting addresses", link->ifname);
+ log_debug_link(link, "setting addresses");
LIST_FOREACH(static_addresses, address, link->network->static_addresses) {
r = address_configure(address, link, &address_handler);
if (r < 0) {
- log_warning("%s: could not set addresses", link->ifname);
+ log_warning_link(link,
+ "could not set addresses: %s", strerror(-r));
link_enter_failed(link);
return r;
}
if (link->dhcp_address) {
r = address_configure(link->dhcp_address, link, &address_handler);
if (r < 0) {
- log_warning("%s: could not set addresses", link->ifname);
+ log_warning_link(link,
+ "could not set addresses: %s", strerror(-r));
link_enter_failed(link);
return r;
}
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
- log_warning("%s: could not drop address: %s",
- link->ifname, strerror(-r));
+ log_warning_link(link, "could not drop address: %s", strerror(-r));
return 1;
}
+static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+ Link *link = userdata;
+ int r;
+
+ assert(m);
+ assert(link);
+ assert(link->ifname);
+
+ if (link->state == LINK_STATE_FAILED)
+ return 1;
+
+ r = sd_rtnl_message_get_errno(m);
+ if (r < 0 && r != -EEXIST)
+ log_warning_link(link, "Could not set MTU: %s", strerror(-r));
+
+ return 1;
+}
+
+static int link_set_mtu(Link *link, uint32_t mtu) {
+ _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ int r;
+
+ assert(link);
+ assert(link->manager);
+ assert(link->manager->rtnl);
+
+ log_debug_link(link, "setting MTU: %" PRIu32, mtu);
+
+ r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
+ if (r < 0) {
+ log_error_link(link, "Could not allocate RTM_SETLINK message");
+ return r;
+ }
+
+ r = sd_rtnl_message_append_u32(req, IFLA_MTU, mtu);
+ if (r < 0) {
+ log_error_link(link, "Could not append MTU: %s", strerror(-r));
+ return r;
+ }
+
+ r = sd_rtnl_call_async(link->manager->rtnl, req, set_mtu_handler, link, 0, NULL);
+ if (r < 0) {
+ log_error_link(link,
+ "Could not send rtnetlink message: %s", strerror(-r));
+ return r;
+ }
+
+ return 0;
+}
+
static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
Link *link = userdata;
struct in_addr address;
int r;
assert(link);
+ assert(link->network);
if (link->state == LINK_STATE_FAILED)
return;
if (event < 0) {
- log_warning("%s: DHCP error: %s", link->ifname, strerror(-event));
+ log_warning_link(link, "DHCP error: %s", strerror(-event));
link_enter_failed(link);
return;
}
if (event == DHCP_EVENT_NO_LEASE)
- log_debug("%s: IP address in use.", link->ifname);
+ log_debug_link(link, "IP address in use.");
if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
event == DHCP_EVENT_STOP) {
route_free(link->dhcp_route);
link->dhcp_route = NULL;
}
+
+ if (link->network->dhcp_mtu) {
+ uint16_t mtu;
+
+ r = sd_dhcp_client_get_mtu(client, &mtu);
+ if (r >= 0 && link->original_mtu != mtu) {
+ r = link_set_mtu(link, link->original_mtu);
+ if (r < 0) {
+ log_warning_link(link, "DHCP error: could not reset MTU");
+ link_enter_failed(link);
+ return;
+ }
+ }
+ }
}
r = sd_dhcp_client_get_address(client, &address);
if (r < 0) {
- log_warning("%s: DHCP error: no address", link->ifname);
+ log_warning_link(link, "DHCP error: no address");
link_enter_failed(link);
return;
}
r = sd_dhcp_client_get_netmask(client, &netmask);
if (r < 0) {
- log_warning("%s: DHCP error: no netmask", link->ifname);
+ log_warning_link(link, "DHCP error: no netmask");
link_enter_failed(link);
return;
}
prefixlen = sd_dhcp_client_prefixlen(&netmask);
if (prefixlen < 0) {
- log_warning("%s: DHCP error: no prefixlen", link->ifname);
+ log_warning_link(link, "DHCP error: no prefixlen");
link_enter_failed(link);
return;
}
r = sd_dhcp_client_get_router(client, &gateway);
if (r < 0) {
- log_warning("%s: DHCP error: no router", link->ifname);
+ log_warning_link(link, "DHCP error: no router");
link_enter_failed(link);
return;
}
if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_IP_ACQUIRE) {
_cleanup_address_free_ Address *addr = NULL;
_cleanup_route_free_ Route *rt = NULL;
-
- log_info("%s: received config over DHCPv4", link->ifname);
+ struct in_addr **nameservers;
+
+ 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);
r = address_new_dynamic(&addr);
if (r < 0) {
- log_error("Could not allocate address");
+ log_error_link(link, "Could not allocate address");
link_enter_failed(link);
return;
}
r = route_new_dynamic(&rt);
if (r < 0) {
- log_error("Could not allocate route");
+ log_error_link(link, "Could not allocate route");
link_enter_failed(link);
return;
}
addr = NULL;
rt = NULL;
+ if (link->network->dhcp_dns) {
+ r = sd_dhcp_client_get_dns(client, &nameservers);
+ 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;
+
+ r = sd_dhcp_client_get_mtu(client, &mtu);
+ if (r >= 0) {
+ r = link_set_mtu(link, mtu);
+ if (r < 0)
+ log_error_link(link, "Failed to set MTU "
+ "to %" PRIu16, mtu);
+ }
+ }
+
link_enter_set_addresses(link);
}
return r;
}
+ log_debug_link(link, "acquiring DHCPv4 lease");
+
+ if (link->network->dhcp_mtu) {
+ r = sd_dhcp_client_set_request_option(link->dhcp, 26);
+ if (r < 0)
+ return r;
+ }
+
r = sd_dhcp_client_start(link->dhcp);
if (r < 0)
return r;
return 0;
if (link->flags == flags) {
- log_debug("%s: link status unchanged: %#x", link->ifname, flags);
+ log_debug_link(link, "link status unchanged: %#.8x", flags);
return 0;
}
- if ((link->flags & IFF_UP) != (flags & IFF_UP)) {
- if (flags & IFF_UP)
- log_info("%s: power on", link->ifname);
- else
- log_info("%s: power off", link->ifname);
- }
+ if ((link->flags & IFF_UP) != (flags & IFF_UP))
+ log_info_link(link,
+ "power %s", flags & IFF_UP ? "on": "off");
if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
if (flags & IFF_LOWER_UP) {
- log_info("%s: carrier on", link->ifname);
+ log_info_link(link, "carrier on");
if (link->network->dhcp) {
r = link_acquire_conf(link);
}
}
} else {
- log_info("%s: carrier off", link->ifname);
+ log_info_link(link, "carrier off");
if (link->network->dhcp) {
r = sd_dhcp_client_stop(link->dhcp);
}
}
- log_debug("%s: link status updated: %#x -> %#x", link->ifname, link->flags, flags);
+ log_debug_link(link,
+ "link status updated: %#.8x -> %#.8x", link->flags, flags);
link->flags = flags;
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning("%s: could not bring up interface: %s",
- link->ifname, strerror(-r));
+ log_warning_link(link,
+ "could not bring up interface: %s", strerror(-r));
link_enter_failed(link);
}
assert(link->manager);
assert(link->manager->rtnl);
- log_debug("%s: bringing up link", link->ifname);
+ log_debug_link(link, "bringing link up");
r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
if (r < 0) {
- log_error("Could not allocate RTM_SETLINK message");
+ log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
}
r = sd_rtnl_message_link_set_flags(req, IFF_UP);
if (r < 0) {
- log_error("Could not set link flags");
+ log_error_link(link, "Could not set link flags: %s", strerror(-r));
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
if (r < 0) {
- log_error("Could not send rtnetlink message: %s", strerror(-r));
+ log_error_link(link,
+ "Could not send rtnetlink message: %s", strerror(-r));
return r;
}
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning("%s: could not join bridge '%s': %s",
- link->ifname, link->network->bridge->name, strerror(-r));
+ log_struct_link(LOG_ERR, link,
+ "MESSAGE=%s: could not join bridge '%s': %s",
+ link->ifname, link->network->bridge->name, strerror(-r),
+ BRIDGE(link->network->bridge),
+ NULL);
link_enter_failed(link);
return 1;
- } else
- log_debug("%s: joined bridge '%s'",
- link->ifname, link->network->bridge->name);
+ }
+
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%s: joined bridge '%s'",
+ link->network->bridge->name,
+ BRIDGE(link->network->bridge),
+ NULL);
link_bridge_joined(link);
if (!link->network->bridge)
return link_bridge_joined(link);
- log_debug("%s: joining bridge", link->ifname);
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%s: joining bridge '%s'",
+ link->network->bridge->name,
+ BRIDGE(link->network->bridge),
+ NULL);
+ log_debug_link(link, "joining bridge");
r = bridge_join(link->network->bridge, link, &bridge_handler);
if (r < 0) {
- log_warning("%s: could not join bridge '%s'", link->ifname,
- link->network->bridge->name);
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not join bridge '%s': %s",
+ link->network->bridge->name, strerror(-r),
+ BRIDGE(link->network->bridge),
+ NULL);
link_enter_failed(link);
return r;
}
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning("%s: could not get state: %s",
- link->ifname, strerror(-r));
+ log_warning_link(link, "could not get state: %s", strerror(-r));
link_enter_failed(link);
}
- log_debug("%s: got link state", link->ifname);
+ log_debug_link(link, "got link state");
link_update(link, m);
assert(link->manager);
assert(link->manager->rtnl);
- log_debug("%s: requesting link status", link->ifname);
+ log_debug_link(link, "requesting link status");
r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
if (r < 0) {
- log_error("Could not allocate RTM_GETLINK message");
+ log_error_link(link, "Could not allocate RTM_GETLINK message");
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
if (r < 0) {
- log_error("Could not send rtnetlink message: %s", strerror(-r));
+ log_error_link(link,
+ "Could not send rtnetlink message: %s", strerror(-r));
return r;
}
int link_update(Link *link, sd_rtnl_message *m) {
unsigned flags;
+ void *data;
+ uint16_t type;
int r;
assert(link);
r = sd_rtnl_message_link_get_flags(m, &flags);
if (r < 0) {
- log_warning("%s: could not get link flags", link->ifname);
+ log_warning_link(link, "Could not get link flags");
return r;
}
+ while (sd_rtnl_message_read(m, &type, &data) > 0) {
+ if (type == IFLA_MTU && link->network->dhcp_mtu && !link->original_mtu) {
+ link->original_mtu = *(uint16_t *) data;
+ log_debug_link(link, "saved original MTU: %" PRIu16, link->original_mtu);
+ }
+ }
+
return link_update_flags(link, flags);
}