Revision 6fb66736
Added by Ermal LUÇI over 12 years ago
| etc/inc/interfaces.inc | ||
|---|---|---|
| 3099 | 3099 |
} |
| 3100 | 3100 |
|
| 3101 | 3101 |
switch($trackcfg['ipaddrv6']) {
|
| 3102 |
case "6to4":
|
|
| 3103 |
if ($g['debug'])
|
|
| 3104 |
log_error("Interface {$interface} configured via {$wancfg['track6-interface']} type {$type}");
|
|
| 3105 |
interface_track6_6to4_configure($interface, $wancfg);
|
|
| 3106 |
break;
|
|
| 3107 |
case "6rd":
|
|
| 3108 |
if ($g['debug'])
|
|
| 3109 |
log_error("Interface {$interface} configured via {$wancfg['track6-interface']} type {$type}");
|
|
| 3110 |
interface_track6_6rd_configure($interface, $wancfg);
|
|
| 3111 |
break;
|
|
| 3112 |
case "dhcp6":
|
|
| 3113 |
if ($g['debug'])
|
|
| 3114 |
log_error("Interface {$interface} configured via {$wancfg['track6-interface']} type {$type}");
|
|
| 3115 |
interface_track6_dhcp6_configure($interface, $wancfg);
|
|
| 3116 |
break;
|
|
| 3102 |
case "6to4": |
|
| 3103 |
if ($g['debug']) |
|
| 3104 |
log_error("Interface {$interface} configured via {$wancfg['track6-interface']} type {$type}");
|
|
| 3105 |
interface_track6_6to4_configure($interface, $wancfg); |
|
| 3106 |
break; |
|
| 3107 |
case "6rd": |
|
| 3108 |
if ($g['debug']) |
|
| 3109 |
log_error("Interface {$interface} configured via {$wancfg['track6-interface']} type {$type}");
|
|
| 3110 |
interface_track6_6rd_configure($interface, $wancfg); |
|
| 3111 |
break; |
|
| 3112 |
case "dhcp6": |
|
| 3113 |
if ($g['debug']) |
|
| 3114 |
log_error("Interface {$interface} configured via {$wancfg['track6-interface']} type {$type}");
|
|
| 3115 |
interface_track6_dhcp6_configure($interface, $wancfg); |
|
| 3116 |
break; |
|
| 3117 | 3117 |
} |
| 3118 | 3118 |
|
| 3119 | 3119 |
if (!function_exists('services_dhcpd_configure'))
|
| ... | ... | |
| 4547 | 4547 |
{
|
| 4548 | 4548 |
global $config; |
| 4549 | 4549 |
|
| 4550 |
if (is_array($config['interfaces'][$interface])) {
|
|
| 4551 |
switch($config['interfaces'][$interface]['ipaddrv6']) {
|
|
| 4552 |
case "6rd": |
|
| 4553 |
case "6to4": |
|
| 4554 |
$realif = "{$interface}_stf";
|
|
| 4555 |
break; |
|
| 4556 |
default: |
|
| 4557 |
$realif = get_real_interface($interface); |
|
| 4558 |
break; |
|
| 4559 |
} |
|
| 4560 |
} |
|
| 4550 |
$realif = get_real_interface($interface, "inet6"); |
|
| 4561 | 4551 |
if (!$realif) {
|
| 4562 | 4552 |
if (preg_match("/^[a-z0-9]+_vip/i", $interface))
|
| 4563 | 4553 |
$realif = $interface; |
| ... | ... | |
| 4634 | 4624 |
switch ($ifname['ipaddrv6']) {
|
| 4635 | 4625 |
case "slaac": |
| 4636 | 4626 |
case "dhcp6": |
| 4637 |
return true; |
|
| 4638 |
break; |
|
| 4639 | 4627 |
case "6to4": |
| 4640 |
return true; |
|
| 4641 |
break; |
|
| 4642 | 4628 |
case "6rd": |
| 4643 | 4629 |
return true; |
| 4644 | 4630 |
break; |
Also available in: Unified diff
Correct get_interface_subnetv6 and use get_interface_ipv6 during dhcp config generation. Also initialize some arrays to avoid warnings