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>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/ndp.c b/src/ndp.c
index 64a6c1c..aaaa69c 100644
--- a/src/ndp.c
+++ b/src/ndp.c
@@ -71,6 +71,8 @@ int ndp_setup_interface(struct interface *iface, bool enable)
 	bool dump_neigh = false;
 	char procbuf[64];
 
+	enable = enable && (iface->ndp == MODE_RELAY);
+
 	snprintf(procbuf, sizeof(procbuf), "/proc/sys/net/ipv6/conf/%s/proxy_ndp", iface->ifname);
 	procfd = open(procbuf, O_WRONLY);
 
@@ -89,13 +91,13 @@ int ndp_setup_interface(struct interface *iface, bool enable)
 		close(iface->ndp_event.uloop.fd);
 		iface->ndp_event.uloop.fd = -1;
 
-		if (!enable || iface->ndp != MODE_RELAY)
+		if (!enable)
 			if (write(procfd, "0\n", 2) < 0) {}
 
 		dump_neigh = true;
 	}
 
-	if (enable && iface->ndp == MODE_RELAY) {
+	if (enable) {
 		struct sockaddr_ll ll;
 		struct packet_mreq mreq;
 		struct icmp6_filter filt;