From 377a218f876507fb8be9c21ef4121fa2576ec317 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 28 Jan 2014 23:23:31 +0100 Subject: sd-dhcp-client/net-util: make netmask_to_prefixlen generic This was originally included in the dhcp-client at my request, but it is not really dhcp-specific and useful outside of it, so let's pull it out. --- src/network/networkd-link.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/network/networkd-link.c') diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index dec33e88ee..f021918311 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -26,6 +26,7 @@ #include "libudev-private.h" #include "util.h" #include "bus-util.h" +#include "net-util.h" int link_new(Manager *manager, struct udev_device *device, Link **ret) { _cleanup_link_free_ Link *link = NULL; @@ -422,7 +423,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { struct in_addr address; struct in_addr netmask; struct in_addr gateway; - int prefixlen; + unsigned prefixlen; int r; assert(link); @@ -496,12 +497,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { return; } - prefixlen = sd_dhcp_client_prefixlen(&netmask); - if (prefixlen < 0) { - log_warning_link(link, "DHCP error: no prefixlen"); - link_enter_failed(link); - return; - } + prefixlen = net_netmask_to_prefixlen(&netmask); r = sd_dhcp_client_get_router(client, &gateway); if (r < 0) { -- cgit v1.2.3-54-g00ecf