dhcp: sort this a little better, loosely refs #6942

This commit is contained in:
Franco Fichtner 2023-10-17 08:15:15 +02:00
parent 854043daa1
commit a224ff4a2b

View File

@ -247,8 +247,8 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
}
switch ($dhcpv6ifconf['ramode']) {
case 'managed':
case 'assist':
case 'managed':
$radvdconf .= "\tAdvManagedFlag on;\n";
$radvdconf .= "\tAdvOtherConfigFlag on;\n";
break;
@ -312,6 +312,12 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
$radvdconf .= "\tprefix {$stanza} {\n";
$radvdconf .= "\t\tDeprecatePrefix " . (!empty($dhcpv6ifconf['AdvDeprecatePrefix']) ? $dhcpv6ifconf['AdvDeprecatePrefix'] : ($carp_mode ? 'off' : 'on')) . ";\n";
switch ($dhcpv6ifconf['ramode']) {
case 'assist':
case 'stateless':
case 'unmanaged':
$radvdconf .= "\t\tAdvOnLink on;\n";
$radvdconf .= "\t\tAdvAutonomous on;\n";
break;
case 'managed':
$radvdconf .= "\t\tAdvOnLink on;\n";
$radvdconf .= "\t\tAdvAutonomous off;\n";
@ -320,12 +326,6 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
$radvdconf .= "\t\tAdvOnLink off;\n";
$radvdconf .= "\t\tAdvAutonomous off;\n";
break;
case 'assist':
case 'unmanaged':
case 'stateless':
$radvdconf .= "\t\tAdvOnLink on;\n";
$radvdconf .= "\t\tAdvAutonomous on;\n";
break;
default:
break;
}