summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-03-06 12:10:03 +0000
committerErmal <eri@pfsense.org>2013-03-06 12:10:03 +0000
commitdcddb2fa412f0b6bf9db089963ea56012c406e52 (patch)
tree60f96b3fb7292cf61bd5e159c01222418afb7f19 /usr
parent2459be5008b31d951bf06ea5c6583a0ebd2fb792 (diff)
downloadpfsense-dcddb2fa412f0b6bf9db089963ea56012c406e52.zip
pfsense-dcddb2fa412f0b6bf9db089963ea56012c406e52.tar.gz
You can have multiple 6rd tunnels now days
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/interfaces.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 30fb21f..0189f21 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -521,9 +521,11 @@ if ($_POST['apply']) {
break;
case "6rd":
foreach ($ifdescrs as $ifent => $ifdescr) {
- if ($if != $ifent && (($config[interfaces][$ifent]['ipaddrv6'] == $_POST['type6']) || ($config[interfaces][$ifent]['ipaddrv6'] == "6to4")) ) {
- $input_errors[] = sprintf(gettext("You can only have one interface configured as %s or 6to4."),$_POST['type6']);
- break;
+ if ($if != $ifent && ($config[interfaces][$ifent]['ipaddrv6'] == $_POST['type6'])) {
+ if ($config[interfaces][$ifent]['prefix-6rd'] == $_POST['prefix-6rd']) {
+ $input_errors[] = gettext("You can only have one interface configured in 6rd with same prefix.");
+ break;
+ }
}
}
if (in_array($wancfg['ipaddrv6'], array()))
@@ -531,8 +533,8 @@ if ($_POST['apply']) {
break;
case "6to4":
foreach ($ifdescrs as $ifent => $ifdescr) {
- if ($if != $ifent && (($config[interfaces][$ifent]['ipaddrv6'] == $_POST['type6']) || ($config[interfaces][$ifent]['ipaddrv6'] == "6rd")) ) {
- $input_errors[] = sprintf(gettext("You can only have one interface configured as %s or 6rd."),$_POST['type6']);
+ if ($if != $ifent && ($config[interfaces][$ifent]['ipaddrv6'] == $_POST['type6'])) {
+ $input_errors[] = sprintf(gettext("You can only have one interface configured as 6to4."),$_POST['type6']);
break;
}
}
OpenPOWER on IntegriCloud