diff options
| author | Susant Sahani <145210+ssahani@users.noreply.github.com> | 2018-01-20 05:12:45 +0530 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-01-20 08:42:45 +0900 |
| commit | 8cdc46e7bad6bb8b1fd34b5ad9d95894e0b6b4eb (patch) | |
| tree | c2df7884a6283c32c29e8d1aa0b76e941fe2a040 /src/libsystemd-network/sd-dhcp-lease.c | |
| parent | c3de717e5121167fd9e744e0712dbd09d79233bc (diff) | |
| download | systemd-8cdc46e7bad6bb8b1fd34b5ad9d95894e0b6b4eb.tar.gz | |
networkd: ignore Static Routes option when Classless Static Routes is given (#7807)
When the DHCP server returns both a Classless Static Routes
option and a Static Routes option, the DHCP client MUST ignore the
Static Routes option.
Closes #7792
Diffstat (limited to 'src/libsystemd-network/sd-dhcp-lease.c')
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-lease.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index 78b8e058b4..2e88e39878 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -471,6 +471,7 @@ static int lease_parse_routes( struct sd_dhcp_route *route = *routes + *routes_size; int r; + route->option = SD_DHCP_OPTION_STATIC_ROUTE; r = in4_addr_default_prefixlen((struct in_addr*) option, &route->dst_prefixlen); if (r < 0) { log_debug("Failed to determine destination prefix length from class based IP, ignoring"); @@ -514,6 +515,7 @@ static int lease_parse_classless_routes( return -ENOMEM; route = *routes + *routes_size; + route->option = SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE; dst_octets = (*option == 0 ? 0 : ((*option - 1) / 8) + 1); route->dst_prefixlen = *option; |