diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-08-28 20:29:10 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-08-31 21:34:58 +0200 |
| commit | 99634696183dfabae20104e58157c69029a11594 (patch) | |
| tree | baa3505182666eaf47944ce6b1d4c0fd93ce28a7 /src/network/networkd-link.c | |
| parent | d728d7faa6c60f185be72510d87bcc565bc0846a (diff) | |
sd-dhcp-server: simplify pool creation
Merge sd_dhcp_server_set_address() and sd_dhcp_server_set_lease_pool() into
sd_dhcp_server_configure_pool() as the behavior of the two former depends
on the order they are called in. The flexibility is not needed, so let's
just do this in one call.
Diffstat (limited to 'src/network/networkd-link.c')
| -rw-r--r-- | src/network/networkd-link.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index d797a8ded8..74dccfccaf 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -730,7 +730,6 @@ static int link_enter_set_addresses(Link *link) { /* now that we can figure out a default address for the dhcp server, start it */ if (link_dhcp4_server_enabled(link)) { - struct in_addr pool_start; Address *address; Link *uplink = NULL; bool acquired_uplink = false; @@ -742,16 +741,8 @@ static int link_enter_set_addresses(Link *link) { return 0; } - r = sd_dhcp_server_set_address(link->dhcp_server, - &address->in_addr.in, - address->prefixlen); - if (r < 0) - return r; - /* offer 32 addresses starting from the address following the server address */ - pool_start.s_addr = htobe32(be32toh(address->in_addr.in.s_addr) + 1); - r = sd_dhcp_server_set_lease_pool(link->dhcp_server, - &pool_start, 32); + r = sd_dhcp_server_configure_pool(link->dhcp_server, &address->in_addr.in, address->prefixlen, 0, 32); if (r < 0) return r; @@ -760,11 +751,6 @@ static int link_enter_set_addresses(Link *link) { &main_address->in_addr.in); if (r < 0) return r; - - r = sd_dhcp_server_set_prefixlen(link->dhcp_server, - main_address->prefixlen); - if (r < 0) - return r; */ if (link->network->dhcp_server_max_lease_time_usec > 0) { |