diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-10-29 07:35:41 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-10-29 07:35:41 -0200 |
| commit | 204bec28359f7ef8bc0dee97b909839a0566daf8 (patch) | |
| tree | 89e68360f20a26bdd95f59c41cf411ef92460b0c /etc | |
| parent | 6721d6d0443bd7e697bd6ca33f470c801608df7e (diff) | |
| download | pfsense-204bec28359f7ef8bc0dee97b909839a0566daf8.zip pfsense-204bec28359f7ef8bc0dee97b909839a0566daf8.tar.gz | |
Revert "Define dynamic gateway for GRE interfaces and do not user to define IP address to the interface. Fixes #3280"
Another solution will be implemented
This reverts commit 6721d6d0443bd7e697bd6ca33f470c801608df7e.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/gwlb.inc | 4 | ||||
| -rw-r--r-- | etc/inc/interfaces.inc | 20 |
2 files changed, 1 insertions, 23 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index 92b90f3..012b288 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -483,8 +483,6 @@ function return_gateways_array($disabled = false, $localhost = false) { default: if (substr($ifcfg['if'], 0, 4) == "ovpn") $ctype = "VPNv4"; - else if (substr($ifcfg['if'], 0, 3) == "gre") - $ctype = "GREv4"; break; } $ctype = "_". strtoupper($ctype); @@ -555,8 +553,6 @@ function return_gateways_array($disabled = false, $localhost = false) { default: if (substr($ifcfg['if'], 0, 4) == "ovpn") $ctype = "VPNv6"; - else if (substr($ifcfg['if'], 0, 3) == "gre") - $ctype = "GREv6"; break; } $ctype = "_". strtoupper($ctype); diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 42c173d..2ede93e 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -4922,7 +4922,7 @@ function get_interfaces_with_gateway() { $ints[$ifdescr] = $ifdescr; break; default: - if (preg_match('/^(ovpn|gre)/', $ifname['if']) || + if (substr($ifname['if'], 0, 4) == "ovpn" || !empty($ifname['gateway'])) $ints[$ifdescr] = $ifdescr; break; @@ -4948,15 +4948,6 @@ function interface_has_gateway($friendly) { default: if (substr($ifname['if'], 0, 4) == "ovpn") return true; - if (substr($ifname['if'], 0, 3) == "gre" && - is_array($config['gres']['gre'])) { - foreach ($config['gres']['gre'] as $gre) { - if ($gre['greif'] != $ifname['if']) - continue; - if (is_ipaddrv4($gre['tunnel-remote-addr'])) - return true; - } - } if (!empty($ifname['gateway'])) return true; break; @@ -4982,15 +4973,6 @@ function interface_has_gatewayv6($friendly) { default: if (substr($ifname['if'], 0, 4) == "ovpn") return true; - if (substr($ifname['if'], 0, 3) == "gre" && - is_array($config['gres']['gre'])) { - foreach ($config['gres']['gre'] as $gre) { - if ($gre['greif'] != $ifname['if']) - continue; - if (is_ipaddrv6($gre['tunnel-remote-addr'])) - return true; - } - } if (!empty($ifname['gatewayv6'])) return true; break; |
