diff options
| author | Dainis Jonitis <dainis.jonitis@ubnt.com> | 2019-04-12 13:46:43 +0300 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-05-15 10:57:12 +0200 |
| commit | 41a74cba1bec349d1e1c5be4442e7fddb2d4adf7 (patch) | |
| tree | c6366d63948eabae512b225c5f149c9306bcee5a /src/dhcpv6.c | |
| parent | c0c8034bc17519c7960f40f6d796b5485cfc4cdb (diff) | |
config: remove 'ignore' config optionbp
1. Remove 'ignore' config option for interface. Interface is still used if
any of 'ra', 'ndp', 'dhcpv4' or 'dhcpv6' options are different from
default 'disabled' mode. In config_parse_interface() update runtime
ignore value according to all mode values.
2. Reset ignore, ra, ndp, dhcpv4 and dhcpv6 values in set_interface_defaults().
Otherwise if option is deleted from config file and config is reloaded,
it will use the value from old config, potentiallly not turning services off.
3. Do not use implicit checks that 0 server mode means MODE_DISABLED.
4. Simplify code of all service setup functions if passed enabled = true
argument, but service mode is disabled.
Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'src/dhcpv6.c')
| -rw-r--r-- | src/dhcpv6.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dhcpv6.c b/src/dhcpv6.c index f71418d..c61a8aa 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -47,6 +47,8 @@ int dhcpv6_setup_interface(struct interface *iface, bool enable) { int ret = 0; + enable = enable && (iface->dhcpv6 != MODE_DISABLED); + if (iface->dhcpv6_event.uloop.fd >= 0) { uloop_fd_delete(&iface->dhcpv6_event.uloop); close(iface->dhcpv6_event.uloop.fd); @@ -54,7 +56,7 @@ int dhcpv6_setup_interface(struct interface *iface, bool enable) } /* Configure multicast settings */ - if (enable && iface->dhcpv6) { + if (enable) { struct sockaddr_in6 bind_addr = {AF_INET6, htons(DHCPV6_SERVER_PORT), 0, IN6ADDR_ANY_INIT, 0}; struct ipv6_mreq mreq; |