summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2016-01-13 12:36:02 -0500
committerjim-p <jimp@pfsense.org>2016-01-13 12:36:02 -0500
commit471e7c3ac7276568c0fea726d699fb63dd87d3eb (patch)
tree8d04cc803019584c51fb01b93b66c2d09a7c9fc8 /src/etc
parentc71e90ede7fa47474a6ebbd617545bd63f8b40d7 (diff)
downloadpfsense-471e7c3ac7276568c0fea726d699fb63dd87d3eb.zip
pfsense-471e7c3ac7276568c0fea726d699fb63dd87d3eb.tar.gz
Prevent GIF/GRE from making dummy/unusable gateways that show up for monitoring/routing/etc. Fixes #5766
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/interfaces.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 5ea49a0..88d2b86 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -5589,7 +5589,9 @@ function interface_has_gateway($friendly) {
}
$tunnelif = substr($ifname['if'], 0, 3);
if ($tunnelif == "gif" || $tunnelif == "gre") {
- return true;
+ if (find_interface_ip($ifname['if'])) {
+ return true;
+ }
}
if (!empty($ifname['gateway'])) {
return true;
@@ -5620,7 +5622,9 @@ function interface_has_gatewayv6($friendly) {
}
$tunnelif = substr($ifname['if'], 0, 3);
if ($tunnelif == "gif" || $tunnelif == "gre") {
- return true;
+ if (find_interface_ipv6($ifname['if'])) {
+ return true;
+ }
}
if (!empty($ifname['gatewayv6'])) {
return true;
OpenPOWER on IntegriCloud