summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2014-12-04 15:58:21 -0600
committerChris Buechler <cmb@pfsense.org>2014-12-04 15:58:21 -0600
commit1d57a7f7c118480b57c994c85665b33f02283ac6 (patch)
tree83f6083c798a28fcda8a065b5cf32eced479564b /etc
parenta623defdee22b877a4b1f059f310dea8e13ea87d (diff)
downloadpfsense-1d57a7f7c118480b57c994c85665b33f02283ac6.zip
pfsense-1d57a7f7c118480b57c994c85665b33f02283ac6.tar.gz
After discussion with Ermal, remove this to force consumers to send things
properly. I fixed the scenario in Unbound where it was sending IPs to these functions rather than an interface, so this has no functional diff.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/interfaces.inc7
1 files changed, 0 insertions, 7 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index a99270d..eea4d6b 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -4798,9 +4798,6 @@ function ip_in_interface_alias_subnet($interface, $ipalias) {
}
function get_interface_ip($interface = "wan") {
- // if we get passed an IP for some reason, return the IP.
- if (is_ipaddr($interface))
- return $interface;
$realif = get_failover_interface($interface);
if (!$realif) {
@@ -4820,10 +4817,6 @@ function get_interface_ip($interface = "wan") {
function get_interface_ipv6($interface = "wan", $flush = false) {
global $config;
- // if we get passed an IP for some reason, return the IP.
- if (is_ipaddr($interface))
- return $interface;
-
$realif = get_failover_interface($interface, "inet6");
if (!$realif) {
if (strstr($interface, "_vip"))
OpenPOWER on IntegriCloud