diff options
author | Thomas Haller <thaller@redhat.com> | 2018-11-27 12:18:29 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-11-27 12:20:51 +0100 |
commit | 3476951cbb5ee5d015e86e645340e9310c84579e (patch) | |
tree | 0feadfe67019f5e80050fc22e5ea091b2e52440b /src/network/networkd-dhcp4.c | |
parent | cf6f5bb5584382732b6c5abdabd4d8519e6352c0 (diff) | |
download | systemd-3476951cbb5ee5d015e86e645340e9310c84579e.tar.gz |
network: use sd_dhcp_route_get_option() accessor in link_set_dhcp_routes()
Diffstat (limited to 'src/network/networkd-dhcp4.c')
-rw-r--r-- | src/network/networkd-dhcp4.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 45b784d023..597791e02b 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -4,7 +4,6 @@ #include <linux/if.h> #include "alloc-util.h" -#include "dhcp-lease-internal.h" #include "hostname-util.h" #include "parse-util.h" #include "netdev/vrf.h" @@ -87,11 +86,14 @@ static int link_set_dhcp_routes(Link *link) { log_link_debug_errno(link, n, "DHCP error: could not get routes: %m"); for (i = 0; i < n; i++) { - if (static_routes[i]->option == SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE) + switch (sd_dhcp_route_get_option(static_routes[i])) { + case SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE: classless_route = true; - - if (static_routes[i]->option == SD_DHCP_OPTION_STATIC_ROUTE) + break; + case SD_DHCP_OPTION_STATIC_ROUTE: static_route = true; + break; + } } for (i = 0; i < n; i++) { @@ -99,7 +101,8 @@ static int link_set_dhcp_routes(Link *link) { /* if the DHCP server returns both a Classless Static Routes option and a Static Routes option, the DHCP client MUST ignore the Static Routes option. */ - if (classless_route && static_routes[i]->option == SD_DHCP_OPTION_STATIC_ROUTE) + if (classless_route && + sd_dhcp_route_get_option(static_routes[i]) != SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE) continue; r = route_new(&route); |