Revision fe838158
Added by Seth Mos about 13 years ago
| etc/inc/services.inc | ||
|---|---|---|
| 84 | 84 |
continue; |
| 85 | 85 |
|
| 86 | 86 |
/* are router advertisements enabled? */ |
| 87 |
if($dhcpv6ifconf['mode'] == "disabled") |
|
| 87 |
if($dhcpv6ifconf['ramode'] == "disabled")
|
|
| 88 | 88 |
continue; |
| 89 |
|
|
| 90 |
$realif = get_real_interface($dhcpv6if); |
|
| 91 | 89 |
|
| 90 |
/* check if we need to listen on a CARP interface */ |
|
| 91 |
$carplist = get_configured_carp_interface_list(); |
|
| 92 |
if($dhcpv6ifconf['rainterface'] <> "") {
|
|
| 93 |
if($carplist[$dhcpv6ifconf['rainterface']] <> "") {
|
|
| 94 |
$realif = $dhcpv6ifconf['rainterface']; |
|
| 95 |
} else {
|
|
| 96 |
$realif = get_real_interface($dhcpv6if); |
|
| 97 |
} |
|
| 98 |
} |
|
| 92 | 99 |
$ifcfgipv6 = get_interface_ipv6($dhcpv6if); |
| 93 | 100 |
if(!is_ipaddrv6($ifcfgipv6)) |
| 94 | 101 |
continue; |
| ... | ... | |
| 106 | 113 |
$radvdconf .= "\tMaxRtrAdvInterval 10;\n"; |
| 107 | 114 |
$radvdconf .= "\tAdvLinkMTU 1280;\n"; |
| 108 | 115 |
// $radvdconf .= "\tDeprecatePrefix on;\n"; |
| 109 |
switch($dhcpv6ifconf['mode']) {
|
|
| 116 |
switch($dhcpv6ifconf['rapriority']) {
|
|
| 117 |
case "low": |
|
| 118 |
$radvdconf .= "\tAdvDefaultPreference low;\n"; |
|
| 119 |
break; |
|
| 120 |
case "medium": |
|
| 121 |
$radvdconf .= "\tAdvDefaultPreference medium;\n"; |
|
| 122 |
break; |
|
| 123 |
case "high": |
|
| 124 |
$radvdconf .= "\tAdvDefaultPreference high;\n"; |
|
| 125 |
break; |
|
| 126 |
} |
|
| 127 |
switch($dhcpv6ifconf['ramode']) {
|
|
| 110 | 128 |
case "managed": |
| 111 | 129 |
$radvdconf .= "\tAdvManagedFlag on;\n"; |
| 112 | 130 |
break; |
| ... | ... | |
| 115 | 133 |
break; |
| 116 | 134 |
} |
| 117 | 135 |
$radvdconf .= "\tprefix {$subnetv6}/{$ifcfgsnv6} {\n";
|
| 118 |
switch($dhcpv6ifconf['mode']) {
|
|
| 136 |
switch($dhcpv6ifconf['ramode']) {
|
|
| 119 | 137 |
case "managed": |
| 120 | 138 |
$radvdconf .= "\t\tAdvOnLink on;\n"; |
| 121 | 139 |
$radvdconf .= "\t\tAdvAutonomous off;\n"; |
| ... | ... | |
| 976 | 994 |
} |
| 977 | 995 |
} |
| 978 | 996 |
|
| 979 |
if($config['dhcpdv6'][$dhcpv6if]['mode'] <> "unmanaged") {
|
|
| 997 |
if($config['dhcpdv6'][$dhcpv6if]['ramode'] <> "unmanaged") {
|
|
| 980 | 998 |
$realif = escapeshellcmd(get_real_interface($dhcpv6if)); |
| 981 | 999 |
$dhcpdv6ifs[] = $realif; |
| 982 | 1000 |
exec("/sbin/ifconfig {$realif} |awk '/ether/ {print $2}'", $mac);
|
Also available in: Unified diff
Change the DHCPv6 services page into a RA and DHCPv6 section, move some of the variables.
Add drop down to select carp vip for that interface for CARP advertisements
Allow setting the RA priority.
Redmine ticket #1829