Revision f2dd61a7
Added by Ermal LUÇI over 11 years ago
| etc/inc/interfaces.inc | ||
|---|---|---|
| 427 | 427 |
if(empty($bridge['bridgeif'])) |
| 428 | 428 |
$bridge['bridgeif'] = "bridge{$i}";
|
| 429 | 429 |
if ($checkmember == 1) {
|
| 430 |
if (strstr($bridge['if'], "@")) |
|
| 431 |
continue; |
|
| 430 | 432 |
$members = explode(',', $bridge['members']);
|
| 431 | 433 |
foreach ($members as $member) {
|
| 432 | 434 |
if (!empty($config['interfaces'][$bridge['if']]) && $config['interfaces'][$bridge['if']]['ipaddrv6'] == "track6") |
| ... | ... | |
| 434 | 436 |
} |
| 435 | 437 |
} |
| 436 | 438 |
else if ($checkmember == 2) {
|
| 439 |
if (strstr($bridge['if'], "@")) |
|
| 440 |
continue; |
|
| 437 | 441 |
$members = explode(',', $bridge['members']);
|
| 438 | 442 |
foreach ($members as $member) {
|
| 439 | 443 |
if (empty($config['interfaces'][$bridge['if']]) || $config['interfaces'][$bridge['if']]['ipaddrv6'] != "track6") |
| ... | ... | |
| 810 | 814 |
if(empty($gre['greif'])) |
| 811 | 815 |
$gre['greif'] = "gre{$i}";
|
| 812 | 816 |
if ($checkparent == 1) {
|
| 817 |
if (strstr($gre['if'], "@")) |
|
| 818 |
continue; |
|
| 813 | 819 |
if (!empty($config['interfaces'][$gre['if']]) && $config['interfaces'][$gre['if']]['ipaddrv6'] == "track6") |
| 814 | 820 |
continue; |
| 815 | 821 |
} |
| 816 | 822 |
else if ($checkparent == 2) {
|
| 823 |
if (strstr($gre['if'], "@")) |
|
| 824 |
continue; |
|
| 817 | 825 |
if (empty($config['interfaces'][$gre['if']]) || $config['interfaces'][$gre['if']]['ipaddrv6'] != "track6") |
| 818 | 826 |
continue; |
| 819 | 827 |
} |
| ... | ... | |
| 880 | 888 |
if(empty($gif['gifif'])) |
| 881 | 889 |
$gre['gifif'] = "gif{$i}";
|
| 882 | 890 |
if ($checkparent == 1) {
|
| 891 |
if (strstr($gif['if'], "@")) |
|
| 892 |
continue; |
|
| 883 | 893 |
if (!empty($config['interfaces'][$gif['if']]) && $config['interfaces'][$gif['if']]['ipaddrv6'] == "track6") |
| 884 | 894 |
continue; |
| 885 | 895 |
} |
| 886 | 896 |
else if ($checkparent == 2) {
|
| 897 |
if (strstr($gif['if'], "@")) |
|
| 898 |
continue; |
|
| 887 | 899 |
if (empty($config['interfaces'][$gif['if']]) || $config['interfaces'][$gif['if']]['ipaddrv6'] != "track6") |
| 888 | 900 |
continue; |
| 889 | 901 |
} |
| ... | ... | |
| 3999 | 4011 |
function convert_real_interface_to_friendly_interface_name($interface = "wan") {
|
| 4000 | 4012 |
global $config; |
| 4001 | 4013 |
|
| 4014 |
if (stristr($interface, "@")) {
|
|
| 4015 |
foreach ($config['virtualip']['vip'] as $counter => $vip) {
|
|
| 4016 |
if ($vip['mode'] == "carp") {
|
|
| 4017 |
$carpif = get_real_interface($vip['interface']) . "@{$vip['vhid']}";
|
|
| 4018 |
if ($interface == $carpif) |
|
| 4019 |
return $vip['interface']; |
|
| 4020 |
} |
|
| 4021 |
} |
|
| 4022 |
} |
|
| 4023 |
|
|
| 4002 | 4024 |
/* XXX: For speed reasons reference directly the interface array */ |
| 4003 | 4025 |
$ifdescrs = &$config['interfaces']; |
| 4004 | 4026 |
//$ifdescrs = get_configured_interface_list(false, true); |
| ... | ... | |
| 4050 | 4072 |
else |
| 4051 | 4073 |
$ifdesc = strtoupper($config['interfaces'][$interface]['descr']); |
| 4052 | 4074 |
break; |
| 4075 |
} else if (stristr($interface, "@")) {
|
|
| 4076 |
if (is_array($config['virtualip']['vip'])) {
|
|
| 4077 |
foreach ($config['virtualip']['vip'] as $counter => $vip) {
|
|
| 4078 |
if ($vip['mode'] == "carp") {
|
|
| 4079 |
$carpif = get_real_interface($vip['interface']) . "@{$vip['vhid']}";
|
|
| 4080 |
if ($interface == $carpif) |
|
| 4081 |
return "{$vip['subnet']} - {$vip['descr']}";
|
|
| 4082 |
} |
|
| 4083 |
} |
|
| 4084 |
} |
|
| 4053 | 4085 |
} else {
|
| 4054 | 4086 |
/* if list */ |
| 4055 | 4087 |
$ifdescrs = get_configured_interface_with_descr(false, true); |
Also available in: Unified diff
Identify vips where needed by @ symbol that will be used