diff --git a/src/etc/inc/plugins.inc.d/dhcpd.inc b/src/etc/inc/plugins.inc.d/dhcpd.inc index b8654bd8b..159cb6885 100644 --- a/src/etc/inc/plugins.inc.d/dhcpd.inc +++ b/src/etc/inc/plugins.inc.d/dhcpd.inc @@ -261,7 +261,7 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = array()) $radvdconf .= "# Generated for DHCPv6 server $dhcpv6if\n"; $radvdconf .= "interface {$realif} {\n"; - $radvdconf .= sprintf("\tAdvSendAdvert %s;\n", !empty($dhcpv6ifconf['ranosend']) ? 'off' : 'on'); + $radvdconf .= "\tAdvSendAdvert on;\n"; $radvdconf .= sprintf("\tMinRtrAdvInterval %s;\n", !empty($dhcpv6ifconf['ramininterval']) ? $dhcpv6ifconf['ramininterval'] : '200'); $radvdconf .= sprintf("\tMaxRtrAdvInterval %s;\n", !empty($dhcpv6ifconf['ramaxinterval']) ? $dhcpv6ifconf['ramaxinterval'] : '600'); $radvdconf .= sprintf("\tAdvLinkMTU %s;\n", !empty($mtu) ? $mtu : 1280); diff --git a/src/www/services_router_advertisements.php b/src/www/services_router_advertisements.php index 0f4b478ff..bb633f89c 100644 --- a/src/www/services_router_advertisements.php +++ b/src/www/services_router_advertisements.php @@ -54,7 +54,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { } // boolean $pconfig['rasamednsasdhcp6'] = isset($config['dhcpdv6'][$if]['rasamednsasdhcp6']); - $pconfig['rasend'] = empty($config['dhcpdv6'][$if]['ranosend']) ? true : null; $pconfig['radefault'] = empty($config['dhcpdv6'][$if]['ranodefault']) ? true : null; // defaults @@ -129,13 +128,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { unset($config['dhcpdv6'][$if]['rainterface']); } - # flipped in GUI on purpose - if (empty($pconfig['rasend'])) { - $config['dhcpdv6'][$if]['ranosend'] = true; - } elseif (isset($config['dhcpdv6'][$if]['ranosend'])) { - unset($config['dhcpdv6'][$if]['ranosend']); - } - # flipped in GUI on purpose if (empty($pconfig['radefault'])) { $config['dhcpdv6'][$if]['ranodefault'] = true; @@ -376,15 +368,6 @@ include("head.inc"); -