X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-dhcp4.c;h=0a8c8ba8e452b862ab6e3144ee406c8971c00f41;hp=5e4ff2b80b796ea33de24b9c80076f408f6db63d;hb=79008bddf679a5e0900369950eb346c9fa687107;hpb=38de08a7e476bb78b02fa5480ca3d038eedd66e7;ds=sidebyside diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 5e4ff2b80..0a8c8ba8e 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -38,7 +38,7 @@ static int dhcp4_route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) { - log_error_link(link, "could not set DHCPv4 route: %s", + log_link_error(link, "could not set DHCPv4 route: %s", strerror(-r)); link_enter_failed(link); } @@ -61,18 +61,27 @@ static int link_set_dhcp_routes(Link *link) { r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); if (r < 0 && r != -ENOENT) { - log_warning_link(link, + log_link_warning(link, "DHCP error: could not get gateway: %s", strerror(-r)); return r; } if (r >= 0) { + struct in_addr address; _cleanup_route_free_ Route *route = NULL; _cleanup_route_free_ Route *route_gw = NULL; + r = sd_dhcp_lease_get_address(link->dhcp_lease, &address); + if (r < 0) { + log_link_warning(link, + "DHCP error: could not get address: %s", + strerror(-r)); + return r; + } + r = route_new_dynamic(&route, RTPROT_DHCP); if (r < 0) { - log_error_link(link, + log_link_error(link, "Could not allocate route: %s", strerror(-r)); return r; @@ -80,7 +89,7 @@ static int link_set_dhcp_routes(Link *link) { r = route_new_dynamic(&route_gw, RTPROT_DHCP); if (r < 0) { - log_error_link(link, + log_link_error(link, "Could not allocate route: %s", strerror(-r)); return r; @@ -92,12 +101,13 @@ static int link_set_dhcp_routes(Link *link) { route_gw->family = AF_INET; route_gw->dst_addr.in = gateway; route_gw->dst_prefixlen = 32; + route_gw->prefsrc_addr.in = address; route_gw->scope = RT_SCOPE_LINK; - route_gw->metrics = DHCP_ROUTE_METRIC; + route_gw->metrics = link->network->dhcp_route_metric; r = route_configure(route_gw, link, &dhcp4_route_handler); if (r < 0) { - log_warning_link(link, + log_link_warning(link, "could not set host route: %s", strerror(-r)); return r; @@ -107,11 +117,12 @@ static int link_set_dhcp_routes(Link *link) { route->family = AF_INET; route->in_addr.in = gateway; - route->metrics = DHCP_ROUTE_METRIC; + route->prefsrc_addr.in = address; + route->metrics = link->network->dhcp_route_metric; r = route_configure(route, link, &dhcp4_route_handler); if (r < 0) { - log_warning_link(link, + log_link_warning(link, "could not set routes: %s", strerror(-r)); link_enter_failed(link); @@ -125,7 +136,7 @@ static int link_set_dhcp_routes(Link *link) { if (n == -ENOENT) return 0; if (n < 0) { - log_warning_link(link, + log_link_warning(link, "DHCP error: could not get routes: %s", strerror(-n)); @@ -137,7 +148,7 @@ static int link_set_dhcp_routes(Link *link) { r = route_new_dynamic(&route, RTPROT_DHCP); if (r < 0) { - log_error_link(link, "Could not allocate route: %s", + log_link_error(link, "Could not allocate route: %s", strerror(-r)); return r; } @@ -146,11 +157,11 @@ static int link_set_dhcp_routes(Link *link) { route->in_addr.in = static_routes[i].gw_addr; route->dst_addr.in = static_routes[i].dst_addr; route->dst_prefixlen = static_routes[i].dst_prefixlen; - route->metrics = DHCP_ROUTE_METRIC; + route->metrics = link->network->dhcp_route_metric; r = route_configure(route, link, &dhcp4_route_handler); if (r < 0) { - log_warning_link(link, + log_link_warning(link, "could not set host route: %s", strerror(-r)); return r; @@ -167,13 +178,13 @@ static int dhcp_lease_lost(Link *link) { struct in_addr addr; struct in_addr netmask; struct in_addr gateway; - unsigned prefixlen; + unsigned prefixlen = 0; int r; assert(link); assert(link->dhcp_lease); - log_warning_link(link, "DHCP lease lost"); + log_link_warning(link, "DHCP lease lost"); if (link->network->dhcp_routes) { struct sd_dhcp_route *routes; @@ -226,15 +237,18 @@ static int dhcp_lease_lost(Link *link) { } } - sd_dhcp_lease_get_address(link->dhcp_lease, &addr); - sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); - prefixlen = in_addr_netmask_to_prefixlen(&netmask); + r = sd_dhcp_lease_get_address(link->dhcp_lease, &addr); + if (r >= 0) { + r = sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); + if (r >= 0) + prefixlen = in_addr_netmask_to_prefixlen(&netmask); - address->family = AF_INET; - address->in_addr.in = addr; - address->prefixlen = prefixlen; + address->family = AF_INET; + address->in_addr.in = addr; + address->prefixlen = prefixlen; - address_drop(address, link, &link_address_drop_handler); + address_drop(address, link, &link_address_drop_handler); + } } if (link->network->dhcp_mtu) { @@ -244,7 +258,7 @@ static int dhcp_lease_lost(Link *link) { if (r >= 0 && link->original_mtu != mtu) { r = link_set_mtu(link, link->original_mtu); if (r < 0) { - log_warning_link(link, + log_link_warning(link, "DHCP error: could not reset MTU"); link_enter_failed(link); return r; @@ -259,7 +273,7 @@ static int dhcp_lease_lost(Link *link) { if (r >= 0 && hostname) { r = link_set_hostname(link, ""); if (r < 0) - log_error_link(link, + log_link_error(link, "Failed to reset transient hostname"); } } @@ -279,7 +293,7 @@ static int dhcp4_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) { - log_error_link(link, "could not set DHCPv4 address: %s", + log_link_error(link, "could not set DHCPv4 address: %s", strerror(-r)); link_enter_failed(link); } else if (r >= 0) { @@ -340,7 +354,7 @@ static int dhcp_lease_renew(sd_dhcp_client *client, Link *link) { r = sd_dhcp_client_get_lease(client, &lease); if (r < 0) { - log_warning_link(link, "DHCP error: no lease %s", + log_link_warning(link, "DHCP error: no lease %s", strerror(-r)); return r; } @@ -351,14 +365,14 @@ static int dhcp_lease_renew(sd_dhcp_client *client, Link *link) { r = sd_dhcp_lease_get_address(lease, &address); if (r < 0) { - log_warning_link(link, "DHCP error: no address: %s", + log_link_warning(link, "DHCP error: no address: %s", strerror(-r)); return r; } r = sd_dhcp_lease_get_netmask(lease, &netmask); if (r < 0) { - log_warning_link(link, "DHCP error: no netmask: %s", + log_link_warning(link, "DHCP error: no netmask: %s", strerror(-r)); return r; } @@ -367,7 +381,7 @@ static int dhcp_lease_renew(sd_dhcp_client *client, Link *link) { r = sd_dhcp_lease_get_lifetime(link->dhcp_lease, &lifetime); if (r < 0) { - log_warning_link(link, + log_link_warning(link, "DHCP error: no lifetime: %s", strerror(-r)); return r; @@ -376,7 +390,7 @@ static int dhcp_lease_renew(sd_dhcp_client *client, Link *link) { r = dhcp4_update_address(link, &address, &netmask, lifetime); if (r < 0) { - log_warning_link(link, "could not update IP address: %s", + log_link_warning(link, "could not update IP address: %s", strerror(-r)); link_enter_failed(link); return r; @@ -399,21 +413,21 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { r = sd_dhcp_client_get_lease(client, &lease); if (r < 0) { - log_warning_link(link, "DHCP error: no lease: %s", + log_link_warning(link, "DHCP error: no lease: %s", strerror(-r)); return r; } r = sd_dhcp_lease_get_address(lease, &address); if (r < 0) { - log_warning_link(link, "DHCP error: no address: %s", + log_link_warning(link, "DHCP error: no address: %s", strerror(-r)); return r; } r = sd_dhcp_lease_get_netmask(lease, &netmask); if (r < 0) { - log_warning_link(link, "DHCP error: no netmask: %s", + log_link_warning(link, "DHCP error: no netmask: %s", strerror(-r)); return r; } @@ -422,13 +436,13 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { r = sd_dhcp_lease_get_router(lease, &gateway); if (r < 0 && r != -ENOENT) { - log_warning_link(link, "DHCP error: could not get gateway: %s", + log_link_warning(link, "DHCP error: could not get gateway: %s", strerror(-r)); return r; } if (r >= 0) - log_struct_link(LOG_INFO, link, + log_link_struct(LOG_INFO, link, "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u", IFNAMSIZ, link->ifname, @@ -443,7 +457,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { ADDRESS_FMT_VAL(gateway), NULL); else - log_struct_link(LOG_INFO, link, + log_link_struct(LOG_INFO, link, "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u", IFNAMSIZ, link->ifname, @@ -464,7 +478,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { if (r >= 0) { r = link_set_mtu(link, mtu); if (r < 0) - log_error_link(link, "Failed to set MTU " + log_link_error(link, "Failed to set MTU " "to %" PRIu16, mtu); } } @@ -476,7 +490,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { if (r >= 0) { r = link_set_hostname(link, hostname); if (r < 0) - log_error_link(link, + log_link_error(link, "Failed to set transient hostname to '%s'", hostname); } @@ -486,7 +500,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { r = sd_dhcp_lease_get_lifetime(link->dhcp_lease, &lifetime); if (r < 0) { - log_warning_link(link, + log_link_warning(link, "DHCP error: no lifetime: %s", strerror(-r)); return r; @@ -495,7 +509,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { r = dhcp4_update_address(link, &address, &netmask, lifetime); if (r < 0) { - log_warning_link(link, "could not update IP address: %s", + log_link_warning(link, "could not update IP address: %s", strerror(-r)); link_enter_failed(link); return r; @@ -519,7 +533,7 @@ static void dhcp4_handler(sd_dhcp_client *client, int event, void *userdata) { case DHCP_EVENT_STOP: case DHCP_EVENT_IP_CHANGE: if (link->network->dhcp_critical) { - log_error_link(link, + log_link_error(link, "DHCPv4 connection considered system critical, ignoring request to reconfigure it."); return; } @@ -557,11 +571,11 @@ static void dhcp4_handler(sd_dhcp_client *client, int event, void *userdata) { break; default: if (event < 0) - log_warning_link(link, + log_link_warning(link, "DHCP error: client failed: %s", strerror(-event)); else - log_warning_link(link, + log_link_warning(link, "DHCP unknown event: %d", event); break; @@ -585,7 +599,9 @@ int dhcp4_configure(Link *link) { if (r < 0) return r; - r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); + r = sd_dhcp_client_set_mac(link->dhcp_client, + (const uint8_t *) &link->mac, + sizeof (link->mac), ARPHRD_ETHER); if (r < 0) return r;