summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/inc/captiveportal.inc4
-rw-r--r--etc/inc/dyndns.class2
-rw-r--r--etc/inc/filter.inc54
-rw-r--r--etc/inc/interfaces.inc125
-rw-r--r--etc/inc/pfsense-utils.inc8
-rw-r--r--etc/inc/services.inc6
-rw-r--r--etc/inc/shaper.inc10
-rw-r--r--etc/inc/vpn.inc4
-rwxr-xr-xetc/rc.banner2
-rwxr-xr-xetc/rc.bootup2
-rwxr-xr-xetc/rc.newwanip6
-rw-r--r--usr/local/pkg/carp_settings.xml4
-rw-r--r--usr/local/pkg/miniupnpd.inc4
-rwxr-xr-xusr/local/www/diag_logs_filter.php7
-rwxr-xr-xusr/local/www/diag_logs_filter_dynamic.php7
-rw-r--r--usr/local/www/diag_packet_capture.php15
-rwxr-xr-xusr/local/www/diag_ping.php27
-rw-r--r--usr/local/www/ifstats.php2
-rw-r--r--usr/local/www/interfaces_lagg_edit.php2
-rwxr-xr-xusr/local/www/pkg_edit.php2
-rw-r--r--usr/local/www/widgets/include/log.inc6
-rwxr-xr-xusr/local/www/wizard.php2
22 files changed, 91 insertions, 210 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index b64fc16..36dedd6 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -1109,7 +1109,7 @@ function getNasID()
function getNasIP()
{
- $nasIp = get_current_wan_address();
+ $nasIp = get_interface_ip();
if(!$nasIp)
$nasIp = "0.0.0.0";
return $nasIp;
@@ -1136,4 +1136,4 @@ function portal_mac_fixed($clientmac) {
return FALSE ;
}
-?> \ No newline at end of file
+?>
diff --git a/etc/inc/dyndns.class b/etc/inc/dyndns.class
index 1ec6f5a..c448112 100644
--- a/etc/inc/dyndns.class
+++ b/etc/inc/dyndns.class
@@ -120,7 +120,7 @@
$this->_dnsMX = $dnsMX;
$this->_if = $dnsIf;
- $this->_dnsIP = get_current_wan_address($dnsIf);
+ $this->_dnsIP = get_interface_ip($dnsIf);
$this->_debugID = rand(1000000, 9999999);
if ($this->_detectChange() == FALSE) {
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index d5254c9..6a422c8 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -401,7 +401,7 @@ function get_direct_networks_list() {
foreach ($iflist as $ifent => $ifname) {
/* do not process interfaces that will end up with gateways */
- $interface_ip = get_current_wan_address($ifent);
+ $interface_ip = get_interface_ip($ifent);
$sn = $config['interfaces'][$ifent]['subnet'];
if($sn == "") {
$subnet = "{$interface_ip}/32";
@@ -435,7 +435,7 @@ function generate_optcfg_array()
$oc = $config['interfaces'][$if];
$oic = array();
- $oic['if'] = get_real_wan_interface($if);
+ $oic['if'] = get_real_interface($if);
$oic['ip'] = $oc['ipaddr'];
$oic['sn'] = $oc['subnet'];
@@ -529,7 +529,7 @@ function filter_nat_rules_generate_if($if, $src = "any", $srcport = "", $dst = "
if ($natip != "") {
$tgt = "{$natip}/32";
} else {
- $natip = get_current_wan_address($if);
+ $natip = get_interface_ip($if);
if(is_ipaddr($natip))
$tgt = "{$natip}/32";
else
@@ -648,7 +648,7 @@ function filter_nat_rules_generate()
else
$natif = $natent['interface'];
- $natif = get_real_wan_interface($natif);
+ $natif = get_real_interface($natif);
if ($natif)
$natrules .= "binat on $natif from {$natent['internal']}/{$sn} to any -> {$natent['external']}/{$sn}\n";
@@ -759,7 +759,7 @@ function filter_nat_rules_generate()
update_filter_reload_status("Creating outbound rules {$if} - ({$ifcfg['descr']})");
if (interface_has_gateway($if)) {
- $target = get_current_wan_address($if);
+ $target = get_interface_ip($if);
/* do not nat tftp proxy */
$natrules .= "no nat on \${$ifcfg['descr']} to port tftp\n";
@@ -787,7 +787,7 @@ function filter_nat_rules_generate()
/* is SPAMD insalled? */
if (is_package_installed("spamd") == 1) {
$natrules .= "\n# spam table \n";
- $wanif = get_real_wan_interface("wan");
+ $wanif = get_real_interface("wan");
$natrules .= "table <whitelist> persist\n";
$natrules .= "table <blacklist> persist\n";
$natrules .= "table <spamd> persist\n";
@@ -833,7 +833,7 @@ function filter_nat_rules_generate()
/* loop through all interfaces and handle ftp-proxy redirections */
foreach ($FilterIflist as $ifent => $ifcfg) {
$realif = $ifcfg['if'];
- $int_ip = get_current_wan_address($ifent);
+ $int_ip = get_interface_ip($ifent);
if ($int_ip == "")
continue;
@@ -960,14 +960,14 @@ function filter_nat_rules_generate()
else
$extaddr = $rule['external-address'];
else
- $extaddr = get_current_wan_address($rule['interface']);
+ $extaddr = get_interface_ip($rule['interface']);
if (!$rule['interface'])
$natif == "wan";
else
$natif = $rule['interface'];
- $natif = get_real_wan_interface($natif);
+ $natif = get_real_interface($natif);
/*
* Expand aliases
@@ -1368,7 +1368,7 @@ function generate_user_filter_rule($rule)
if (!array_key_exists($rule['source']['network'], $FilterIflist)) {
$optmatch = "";
if (preg_match("/opt([0-999])/", $rule['source']['network'], $optmatch)) {
- $opt_ip = get_current_wan_address("opt{$optmatch[1]}");
+ $opt_ip = get_interface_ip("opt{$optmatch[1]}");
if(!$opt_ip)
return "# unresolvable optarray $optmatch[0] - $opt_ip";
} else {
@@ -1379,7 +1379,7 @@ function generate_user_filter_rule($rule)
if ($rule['destination']['network'] && strstr($rule['destination']['network'], "opt")) {
if (!array_key_exists($rule['destination']['network'], $FilterIflist)) {
if(preg_match("/opt([0-999])/", $rule['destination']['network'], $optmatch)) {
- $opt_ip = get_current_wan_address("opt{$optmatch[1]}");
+ $opt_ip = get_interface_ip("opt{$optmatch[1]}");
if(!$opt_ip)
return "# unresolvable oparray $optmatch[0] - $opt_ip";
} else {
@@ -1505,7 +1505,7 @@ function generate_user_filter_rule($rule)
/* determine interface gateway */
foreach($config['gateways']['gateway_item'] as $gateway) {
if($gateway['name'] == $member) {
- $int = get_real_wan_interface($gateway['interface']);
+ $int = get_real_interface($gateway['interface']);
if(is_ipaddr($gateway['gateway']))
$gatewayip = $gateway['gateway'];
else
@@ -1546,7 +1546,7 @@ function generate_user_filter_rule($rule)
$gw = lookup_gateway_ip_by_name($rule['gateway']);
if ($gw == false) {
if (array_key_exists($gateway, $FilterIflist)) {
- $int = get_real_wan_interface($gateway);
+ $int = get_real_interface($gateway);
$gw = get_interface_gateway($gateway);
} else {
$gw = $gateway;
@@ -1590,15 +1590,15 @@ function generate_user_filter_rule($rule)
$matches = "";
if (preg_match("/opt([0-9999])ip/", $rule['source']['network'], $matches)) {
$optnum = $matches[1];
- $src = get_current_wan_address("opt{$optnum}");
+ $src = get_interface_ip("opt{$optnum}");
}
} else {
switch ($rule['source']['network']) {
case 'wanip':
- $src = get_current_wan_address("wan");
+ $src = get_interface_ip("wan");
break;
case 'lanip':
- $src = get_current_wan_address("lan");
+ $src = get_interface_ip("lan");
break;
case 'lan':
$lansa = gen_subnet($FilterIflist['lan']['ip'], $FilterIflist['lan']['sn']);
@@ -1700,16 +1700,16 @@ function generate_user_filter_rule($rule)
$matches = "";
if (preg_match("/opt([0-9999])ip/", $rule['destination']['network'], $matches)) {
$optnum = $matches[1];
- $dst = get_current_wan_address("opt{$optnum}");
+ $dst = get_interface_ip("opt{$optnum}");
}
if (isset($rule['destination']['not'])) $dst = " !{$dst}";
} else {
switch ($rule['destination']['network']) {
case 'wanip':
- $dst = get_current_wan_address("wan");
+ $dst = get_interface_ip("wan");
break;
case 'lanip':
- $dst = get_current_wan_address("lan");
+ $dst = get_interface_ip("lan");
break;
case 'lan':
$lansa = gen_subnet($FilterIflist['lan']['ip'], $FilterIflist['lan']['sn']);
@@ -2228,7 +2228,7 @@ EOD;
if (count($config['interfaces']) > 1) {
/* if antilockout is enabled, LAN exists and has
an IP and subnet mask assigned */
- $lanif = get_real_wan_interface("lan");
+ $lanif = get_real_interface("lan");
$ipfrules .= <<<EOD
# make sure the user cannot lock himself out of the webConfigurator or SSH
anchor "anti-lockout"
@@ -2237,7 +2237,7 @@ pass in quick on {$lanif} from any to ({$lanif}) keep state label "anti-lockout
EOD;
} else {
/* single-interface deployment, add to WAN */
- $wanif = get_real_wan_interface("wan");
+ $wanif = get_real_interface("wan");
$ipfrules .= <<<EOD
# make sure the user cannot lock himself out of the webConfigurator or SSH
anchor "anti-lockout"
@@ -2251,7 +2251,7 @@ EOD;
if ($pptpdcfg['mode'] && ($pptpdcfg['mode'] != "off")) {
if ($pptpdcfg['mode'] == "server")
- $pptpdtarget = get_current_wan_address();
+ $pptpdtarget = get_interface_ip();
else
$pptpdtarget = $pptpdcfg['redir'];
@@ -2313,7 +2313,7 @@ EOD;
else
$extaddr = $rule['external-address'];
} else
- $extaddr = get_current_wan_address($rule['interface']);
+ $extaddr = get_interface_ip($rule['interface']);
/*
* Expand aliases
@@ -2532,7 +2532,7 @@ EOD;
continue;
$gateway = get_interface_gateway($ifr);
- $interface = get_real_wan_interface($ifr);
+ $interface = get_real_interface($ifr);
/* Just in case */
if (!is_ipaddr($gateway) || empty($interface)) {
$route_to = " ";
@@ -2623,9 +2623,9 @@ function setup_logging_interfaces()
foreach ($ifdescrs as $ifdescr => $ifname) {
/* do not work with tun interfaces */
- if(stristr(get_real_wan_interface($ifname), "tun") == true)
+ if(stristr(get_real_interface($ifname), "tun") == true)
continue;
- $int = get_real_wan_interface($ifname);
+ $int = get_real_interface($ifname);
$rules .= "set loginterface {$int}\n";
}
return $rules;
@@ -2637,7 +2637,7 @@ function process_carp_nat_rules()
update_filter_reload_status("Creating CARP NAT rules");
- $wan_interface = get_real_wan_interface();
+ $wan_interface = get_real_interface();
if(isset($config['system']['developerspew'])) {
$mt = microtime();
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index cf76940..f2821e1 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -137,7 +137,7 @@ function interface_bridge_configure(&$bridge)
foreach ($members as $member) {
if (!array_key_exists($member, $checklist))
continue;
- $realif = get_real_wan_interface($member);
+ $realif = get_real_interface($member);
$realif = escapeshellarg($realif);
/* make sure the parent interface is up */
mwexec("/sbin/ifconfig {$realif} up");
@@ -161,7 +161,7 @@ function interface_bridge_configure(&$bridge)
$stpifs = explode(',', $bridge['stp']);
foreach ($stpifs as $stpif) {
- $realif = get_real_wan_interface($stpif);
+ $realif = get_real_interface($stpif);
mwexec("/sbin/ifconfig {$bridgeif} stp {$realif}");
}
if ($bridge['maxage'] <> "")
@@ -182,7 +182,7 @@ function interface_bridge_configure(&$bridge)
$ifpriority[$key] = $value;
}
foreach ($ifpriority as $key => $value) {
- $realif = get_real_wan_interface($key);
+ $realif = get_real_interface($key);
mwexec("/sbin/ifconfig ${bridgeif} ifpriority {$realif} {$value}");
}
$pconfig = explode(",", $bridges['ifpathcost']);
@@ -193,7 +193,7 @@ function interface_bridge_configure(&$bridge)
$ifpathcost[$key] = $value;
}
foreach ($ifpriority as $key => $value) {
- $realif = get_real_wan_interface($key);
+ $realif = get_real_interface($key);
mwexec("/sbin/ifconfig ${bridgeif} ifpathcost {$realif} {$value}");
}
@@ -204,37 +204,37 @@ function interface_bridge_configure(&$bridge)
if ($bridge['timeout'] <> "")
mwexec("/sbin/ifconfig {$bridgeif} timeout {$bridge['timeout']}");
if ($bridge['span'] <> "") {
- $realif = get_real_wan_interface($bridge['span']);
+ $realif = get_real_interface($bridge['span']);
mwexec("/sbin/ifconfig {$bridgeif} span {$realif}");
}
$edgeifs = explode(',', $bridge['edge']);
foreach ($edgeifs as $edgeif) {
- $realif = get_real_wan_interface($edgeif);
+ $realif = get_real_interface($edgeif);
mwexec("/sbin/ifconfig {$bridgeif} edge {$realif}");
}
$edgeifs = explode(',', $bridge['autoedge']);
foreach ($edgeifs as $edgeif) {
- $realif = get_real_wan_interface($edgeif);
+ $realif = get_real_interface($edgeif);
mwexec("/sbin/ifconfig {$bridgeif} -autoedge {$realif}");
}
$ptpifs = explode(',', $bridge['ptp']);
foreach ($ptpifs as $ptpif) {
- $realif = get_real_wan_interface($ptpif);
+ $realif = get_real_interface($ptpif);
mwexec("/sbin/ifconfig {$bridgeif} ptp {$realif}");
}
$ptpifs = explode(',', $bridge['autoptp']);
foreach ($ptpifs as $ptpif) {
- $realif = get_real_wan_interface($ptpif);
+ $realif = get_real_interface($ptpif);
mwexec("/sbin/ifconfig {$bridgeif} -autoptp {$realif}");
}
$stickyifs = explode(',', $bridge['static']);
foreach ($stickyifs as $stickyif) {
- $realif = get_real_wan_interface($stickyif);
+ $realif = get_real_interface($stickyif);
mwexec("/sbin/ifconfig {$bridgeif} sticky {$realif}");
}
$privateifs = explode(',', $bridge['private']);
foreach ($privateifs as $privateif) {
- $realif = get_real_wan_interface($privateif);
+ $realif = get_real_interface($privateif);
mwexec("/sbin/ifconfig {$bridgeif} private {$realif}");
}
@@ -325,8 +325,8 @@ function interface_gre_configure(&$gre)
if (!is_array($gre))
return -1;
- $realif = get_real_wan_interface($gre['if']);
- $realifip = get_current_wan_address($gre['if']);
+ $realif = get_real_interface($gre['if']);
+ $realifip = get_interface_ip($gre['if']);
/* make sure the parent interface is up */
mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " up");
@@ -378,8 +378,8 @@ function interface_gif_configure(&$gif)
if (!is_array($gif))
return -1;
- $realif = get_real_wan_interface($gif['if']);
- $realifip = get_current_wan_address($gif['if']);
+ $realif = get_real_interface($gif['if']);
+ $realifip = get_interface_ip($gif['if']);
/* make sure the parent interface is up */
mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " up");
@@ -520,7 +520,7 @@ function interface_bring_down($interface = "wan")
$ifcfg = $config['interfaces'][$interface];
- $realif = get_real_wan_interface($interface);
+ $realif = get_real_interface($interface);
mwexec("/usr/sbin/arp -d -i {$realif} -a");
@@ -896,7 +896,7 @@ function interfaces_ipalias_configure()
if(is_array($viparr)) {
foreach ($viparr as $vip) {
if ($vip['mode'] == "ipalias") {
- $if = get_real_wan_interface($vip['interface']);
+ $if = get_real_interface($vip['interface']);
mwexec("/sbin/ifconfig " . escapeshellarg($if) . " " . $vip['subnet'] . "/" . escapeshellarg($vip['subnet_bits']) . " alias");
}
}
@@ -1164,7 +1164,7 @@ function kill_wpasupplicant($interface)
function find_dhclient_process($interface)
{
- $realinterface = get_real_wan_interface($interface);
+ $realinterface = get_real_interface($interface);
if($realinterface)
$pid = `ps awwwux | grep dhclient | grep -v grep | grep {$realinterface} | awk '{ print \$2 }'`;
return $pid;
@@ -1176,7 +1176,7 @@ function interface_configure($interface = "wan")
$wancfg = $config['interfaces'][$interface];
- $realif = get_real_wan_interface($interface);
+ $realif = get_real_interface($interface);
if(file_exists("/tmp/{$realif}_router"))
unlink("/tmp/{$realif}_router");
@@ -1345,7 +1345,7 @@ function interface_dhcp_configure($interface = "wan")
$dhclientconf_hostname = "";
}
- $wanif = get_real_wan_interface($interface);
+ $wanif = get_real_interface($interface);
$dhclientconf = "";
@@ -1673,7 +1673,7 @@ EOD;
return 0;
}
-function get_real_wan_interface($interface = "wan")
+function get_real_interface($interface = "wan")
{
global $config;
@@ -1747,91 +1747,20 @@ function get_real_wan_interface($interface = "wan")
return $wanif;
}
-function get_current_wan_address($interface = "wan")
+function get_interface_ip($interface = "wan")
{
global $config, $g;
- $realif = get_real_wan_interface($interface);
+ $realif = get_real_interface($interface);
/* Do we really come here for these interfaces ?! */
if (in_array($realif, array("pptp", "pppoe", "openvpn", "enc0" /* , "ppp" */)))
return "";
- $wancfg = $config['interfaces'][$interface];
-
- $ifinfo = "";
- switch ($wancfg['ipaddr']) {
- case "dhcp":
- /* get interface info with netstat */
- exec("/usr/bin/netstat -nWI " . escapeshellarg($realif) . " -f inet", $ifinfo);
-
- if (isset($ifinfo[1])) {
- $aif = preg_split("/\s+/", $ifinfo[1]);
- $curwanip = chop($aif[3]);
-
- if ($curwanip && is_ipaddr($curwanip) && ($curwanip != "0.0.0.0"))
- return $curwanip;
- }
-
- return null;
- break;
- case "pppoe":
- case "pptp":
- /* get interface info with netstat */
- exec("/usr/bin/netstat -nWI " . escapeshellarg($realif) . " -f inet", $ifinfo);
- if (isset($ifinfo[1])) {
- $aif = preg_split("/\s+/", $ifinfo[1]);
- $curwanip = chop($aif[3]);
-
- if ($curwanip && is_ipaddr($curwanip) && ($curwanip != "0.0.0.0"))
- return $curwanip;
- }
-
- return null;
- break;
- /* carpdev support */
- case "carpdev-dhcp":
- $viparr = &$config['virtualip']['vip'];
- $counter = 0;
- if (is_array($viparr))
- foreach ($viparr as $vip) {
- if ($vip['mode'] == "carpdev-dhcp" &&
- $vip['interface'] == $interface) {
- return str_replace("\n", "", `ifconfig carp{$counter} | grep inet | awk '{ print $2 }'`);
- $counter++;
- } else if ($vip['mode'] == "carp")
- $counter++;
- }
- return null;
- break;
- default:
- if (isset($cfg['ispointtopoint']) && $cfg['pointtopoint']) {
- /* get interface info with netstat */
- exec("/usr/bin/netstat -nWI " . escapeshellarg($realif) . " -f inet", $ifinfo);
- if (isset($ifinfo[1])) {
- $aif = preg_split("/\s+/", $ifinfo[1]);
- $curwanip = chop($aif[3]);
- if ($curwanip && is_ipaddr($curwanip) && ($curwanip != "0.0.0.0"))
- return $curwanip;
- }
-
- return null;
- } else if (stristr($realif, "gre")) {
- if (is_array($config['gres']['gre']))
- foreach ($config['gres']['gre'] as $grecfg)
- if ($grecfg['greif'] == $realif)
- return ($grecfg['tunnel-local-addr']);
- } else if (stristr($realif, "gif")) {
- if (is_array($config['gifs']['gif']))
- foreach ($config['gifs']['gif'] as $gifcfg)
- if ($gifcfg['gifif'] == $realif)
- return ($gifcfg['tunnel-local-addr']);
- }
-
- break;
- }
+ $curip = find_interface_ip($realif);
+ if ($curip && is_ipaddr($curip) && ($curip != "0.0.0.0"))
+ return $curip;
- /* static WAN IP address */
- return $wancfg['ipaddr'];
+ return null;
}
/****f* interfaces/is_altq_capable
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index d3980fb..8360356 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -200,7 +200,7 @@ function tdr_create_ipfw_rule($rule, $type) {
$pppoecfg = $config['pppoe'];
$lanif = $lancfg['if'];
- $wanif = get_real_wan_interface();
+ $wanif = get_real_interface();
$lanip = $lancfg['ipaddr'];
$lansa = gen_subnet($lancfg['ipaddr'], $lancfg['subnet']);
@@ -211,7 +211,7 @@ function tdr_create_ipfw_rule($rule, $type) {
$optcfg = array();
generate_optcfg_array($optcfg);
- $curwanip = get_current_wan_address();
+ $curwanip = get_interface_ip();
/* don't include disabled rules */
if (isset($rule['disabled'])) {
@@ -3413,7 +3413,7 @@ function get_interface_gateway($interface) {
// for dynamic interfaces we handle them through the $interface_router file.
if (!is_ipaddr($gw)) {
- $realif = get_real_wan_interface($interface);
+ $realif = get_real_interface($interface);
if (file_exists("{$g['tmp_path']}/{$realif}_router")) {
$gw = file_get_contents("{$g['tmp_path']}/{$realif}_router");
$gw = rtrim($gw);
@@ -3522,7 +3522,7 @@ function get_interface_info($ifdescr) {
foreach ($iflist as $if => $ifname) {
if ($ifdescr == $if || $ifdescr == $ifname) {
$ifinfo['hwif'] = $config['interfaces'][$if]['if'];
- $ifinfo['if'] = get_real_wan_interface($if);
+ $ifinfo['if'] = get_real_interface($if);
$found = true;
break;
}
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 381aca6..559cdce 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -476,7 +476,7 @@ function services_dyndns_reset($interface, $dyndnsservice) {
function services_dyndns_configure_client($conf) {
/* determine interface name */
- $if = get_real_wan_interface($conf['interface']);
+ $if = get_real_interface($conf['interface']);
/* load up the dyndns.class */
require_once("dyndns.class");
@@ -816,11 +816,11 @@ function services_dnsupdate_process() {
continue;
/* determine interface name */
if ($dyndns['interface'] == "wan")
- $if = get_real_wan_interface();
+ $if = get_real_interface();
else
$if = convert_friendly_interface_to_real_interface_name($dyndns['interface']);
- $wanip = get_current_wan_address($if);
+ $wanip = get_interface_ip($if);
if ($wanip) {
$keyname = $dnsupdate['keyname'];
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index 6fdf7a1..7e678cb 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -513,7 +513,7 @@ class altq_root_queue {
*/
function build_rules() {
if (count($this->queues) > 0 && $this->GetEnabled()) {
- $rules = " altq on " . get_real_wan_interface($this->GetInterface());
+ $rules = " altq on " . get_real_interface($this->GetInterface());
if ($this->GetScheduler())
$rules .= " ".strtolower($this->GetScheduler());
if ($this->GetBandwidth())
@@ -991,7 +991,7 @@ function GetEcn() {
function build_rules() {
$pfq_rule = " queue ". $this->qname;
if ($this->GetInterface())
- $pfq_rule .= " on ".get_real_wan_interface($this->GetInterface());
+ $pfq_rule .= " on ".get_real_interface($this->GetInterface());
if ($this->GetQpriority())
$pfq_rule .= " priority ".$this->GetQpriority();
if ($this->GetQlimit())
@@ -1566,7 +1566,7 @@ class hfsc_queue extends priq_queue {
$pfq_rule = " queue ". $this->qname;
if ($this->GetInterface())
- $pfq_rule .= " on ".get_real_wan_interface($this->GetInterface());
+ $pfq_rule .= " on ".get_real_interface($this->GetInterface());
if ($this->GetBandwidth() && $this->GetBwscale())
$pfq_rule .= " bandwidth ".trim($this->GetBandwidth()).$this->GetBwscale();
@@ -2020,7 +2020,7 @@ class cbq_queue extends priq_queue {
function build_rules() {
$pfq_rule = "queue ". $this->qname;
if ($this->GetInterface())
- $pfq_rule .= " on ".get_real_wan_interface($this->GetInterface());
+ $pfq_rule .= " on ".get_real_interface($this->GetInterface());
if ($this->GetBandwidth() && $this->GetBwscale())
$pfq_rule .= " bandwidth ".trim($this->GetBandwidth()).$this->GetBwscale();
if ($this->GetQpriority())
@@ -2264,7 +2264,7 @@ class fairq_queue extends priq_queue {
function build_rules() {
$pfq_rule = "queue ". $this->qname;
if ($this->GetInterface())
- $pfq_rule .= " on ".get_real_wan_interface($this->GetInterface());
+ $pfq_rule .= " on ".get_real_interface($this->GetInterface());
if ($this->GetBandwidth() && $this->GetBwscale())
$pfq_rule .= " bandwidth ".trim($this->GetBandwidth()).$this->GetBwscale();
if ($this->GetQpriority())
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index ce4e477..5cd0897 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -120,7 +120,7 @@ function vpn_ipsec_configure($ipchg = false)
for ($x = 0; $x < $number_of_gifs; $x++)
mwexec("/sbin/ifconfig gif" . $x . " delete");
- $curwanip = get_current_wan_address();
+ $curwanip = get_interface_ip();
$syscfg = $config['system'];
$ipseccfg = $config['ipsec'];
@@ -734,7 +734,7 @@ EOD;
if (isset ($ph2ent['creategif'])) {
$number_of_gifs = find_last_gif_device();
$number_of_gifs++;
- $curwanip = get_current_wan_address();
+ $curwanip = get_interface_ip();
if ($config['installedpackages']['sasyncd']['config'] <> "") {
foreach ($config['installedpackages']['sasyncd']['config'] as $sasyncd) {
if ($sasyncd['ip'] <> "")
diff --git a/etc/rc.banner b/etc/rc.banner
index 2b9dc5f..edb4ca2 100755
--- a/etc/rc.banner
+++ b/etc/rc.banner
@@ -77,7 +77,7 @@
//$ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr'];
break;
}
- $ifinfo['ipaddr'] = get_current_wan_address($ifinfo['friendly']);
+ $ifinfo['ipaddr'] = get_interface_ip($ifinfo['friendly']);
$tobanner = $friendly;
/* does this interface have an extra description? */
if($ifconf['descr']) {
diff --git a/etc/rc.bootup b/etc/rc.bootup
index eeccf87..00b30c7 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -75,7 +75,7 @@
echo "done.\n";
$lan_if = $config['interfaces']['lan']['if'];
- $wan_if = get_real_wan_interface();
+ $wan_if = get_real_interface();
/*
* Determine if we need to throw a interface exception
diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 2141835..8eaca24 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -43,15 +43,15 @@ $argument = str_replace("\n", "", $argv[1]);
log_error("Informational: rc.newwanip is starting {$argument}.");
if(empty($argument)) {
- $curwanip = get_current_wan_address();
+ $curwanip = get_interface_ip();
$interface = "wan";
- $interface_real = get_real_wan_interface();
+ $interface_real = get_real_interface();
} else {
$interface = convert_real_interface_to_friendly_interface_name($argument);
$interface_real = $argument;
$curwanip = find_interface_ip($interface_real);
if($curwanip == "")
- $curwanip = get_current_wan_address($interface);
+ $curwanip = get_interface_ip($interface);
}
log_error("rc.newwanip working with (IP address: {$curwanip}) (interface: {$interface}) (interface real: {$interface_real}).");
diff --git a/usr/local/pkg/carp_settings.xml b/usr/local/pkg/carp_settings.xml
index 087a109..29c1ba9 100644
--- a/usr/local/pkg/carp_settings.xml
+++ b/usr/local/pkg/carp_settings.xml
@@ -181,7 +181,7 @@
$input_errors[] = "CARP sync IP must be the backup firewall IP! You cannot specify this firewalls IP in this location.";
}
}
- $wanip = find_interface_ip(get_real_wan_interface());
+ $wanip = get_interface_ip();
if($wanip == $_POST["synchronizetoip"])
$input_errors[] = "CARP sync IP must be the backup firewall's IP! You cannot specify this firewall's IP in this location.";
}
@@ -192,4 +192,4 @@
/* force a filter configure for syncing */
filter_configure();
</custom_add_php_command_late>
-</packagegui> \ No newline at end of file
+</packagegui>
diff --git a/usr/local/pkg/miniupnpd.inc b/usr/local/pkg/miniupnpd.inc
index 0d80700..0f74540 100644
--- a/usr/local/pkg/miniupnpd.inc
+++ b/usr/local/pkg/miniupnpd.inc
@@ -25,7 +25,7 @@
function upnp_uuid() {
/* md5 hash of wan mac */
- $uuid = md5(exec('arp -an -i '.get_real_wan_interface().' | /usr/bin/cut -d " " -f4'));
+ $uuid = md5(exec('arp -an -i '.get_real_interface().' | /usr/bin/cut -d " " -f4'));
/* put uuid in correct format 8-4-4-4-12 */
return substr($uuid,0,8).'-'.substr($uuid,9,4).'-'.substr($uuid,13,4).'-'.substr($uuid,17,4).'-'.substr($uuid,21,12);
}
@@ -123,7 +123,7 @@
$upnp_config = $config['installedpackages']['miniupnpd']['config'][0];
$config_file = '/var/etc/miniupnpd.conf';
- $config_text = "ext_ifname=".get_real_wan_interface()."\n";
+ $config_text = "ext_ifname=".get_real_interface()."\n";
$config_text .= "port=2189\n";
$ifaces_active = '';
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index 11e7478..850a338 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -73,12 +73,9 @@ function conv_clog($logfile, $tail = 50) {
$logarr = "";
/* make interface/port table */
$iftable = array();
- $iftable[$config['interfaces']['lan']['if']] = "LAN";
- $iftable[get_real_wan_interface()] = "WAN";
- /* optional if list */
- $iflist = get_configured_interface_with_descr(true);
+ $iflist = get_configured_interface_with_descr();
foreach ($iflist as $if => $ifdesc)
- $iftable[$config['interfaces'][$if]['if']] = $ifdesc;
+ $iftable[get_real_interface($if)] = $ifdesc;
$sor = isset($config['syslog']['reverse']) ? "-r" : "";
diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php
index 62de8fa..e91b4e1 100755
--- a/usr/local/www/diag_logs_filter_dynamic.php
+++ b/usr/local/www/diag_logs_filter_dynamic.php
@@ -68,12 +68,9 @@ function conv_clog_filter($logfile, $tail = 50) {
/* make interface/port table */
$iftable = array();
- $iftable[$config['interfaces']['lan']['if']] = "LAN";
- $iftable[get_real_wan_interface()] = "WAN";
- /* optional if list */
- $iflist = get_configured_interface_with_descr(true);
+ $iflist = get_configured_interface_with_descr();
foreach ($iflist as $if => $ifdesc)
- $iftable[$config['interfaces'][$if]['if']] = $ifdesc;
+ $iftable[get_real_interface($if)] = $ifdesc;
$sor = isset($config['syslog']['reverse']) ? "-r" : "";
diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php
index 4ff4ed9..fa972ff 100644
--- a/usr/local/www/diag_packet_capture.php
+++ b/usr/local/www/diag_packet_capture.php
@@ -40,21 +40,6 @@ $fn = "packetcapture.cap";
$snaplen = 1500;//default packet length
$count = 100;//default number of packets to capture
-function get_interface_addr($if) {
- global $config;
-
- $ifdescr = convert_friendly_interface_to_friendly_descr($if);
-
- /* find out interface name */
- if ($ifdescr == "wan")
- $if = get_real_wan_interface();
- else
- $if = $config['interfaces'][$ifdescr];
-
- return $if;
-
-}
-
if ($_POST) {
$do_tcpdump = true;
$host = $_POST['host'];
diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index e80aa76..e4cc4f4 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -68,31 +68,6 @@ if (!isset($do_ping)) {
$count = DEFAULT_COUNT;
}
-function get_interface_addr($ifdescr) {
-
- global $config, $g;
-
- /* find out interface name */
- if ($ifdescr == "wan")
- $if = get_real_wan_interface();
- else
- $if = $config['interfaces'][$ifdescr]['if'];
-
- /* try to determine IP address and netmask with ifconfig */
- $ifconfiginfo = "";
- $matches = "";
- unset($ifconfiginfo);
- exec("/sbin/ifconfig " . $if, $ifconfiginfo);
-
- foreach ($ifconfiginfo as $ici) {
- if (preg_match("/inet (\S+)/", $ici, $matches)) {
- return $matches[1];
- }
- }
-
- return false;
-}
-
include("head.inc"); ?>
<body link="#000000" vlink="#000000" alink="#000000">
<? include("fbegin.inc"); ?>
@@ -145,7 +120,7 @@ include("head.inc"); ?>
echo("<strong>Ping output:</strong><br>");
echo('<pre>');
ob_end_flush();
- $ifaddr = get_interface_addr($interface);
+ $ifaddr = get_interface_ip($interface);
if ($ifaddr)
system("/sbin/ping -S$ifaddr -c$count " . escapeshellarg($host));
else
diff --git a/usr/local/www/ifstats.php b/usr/local/www/ifstats.php
index e35f35c..1e177cf 100644
--- a/usr/local/www/ifstats.php
+++ b/usr/local/www/ifstats.php
@@ -43,7 +43,7 @@
$if = $_GET['if'];
- $realif = get_real_wan_interface($if);
+ $realif = get_real_interface($if);
if(!$realif)
$realif = $if; // Need for IPSec case interface.
diff --git a/usr/local/www/interfaces_lagg_edit.php b/usr/local/www/interfaces_lagg_edit.php
index 2268053..032e239 100644
--- a/usr/local/www/interfaces_lagg_edit.php
+++ b/usr/local/www/interfaces_lagg_edit.php
@@ -40,7 +40,7 @@ $portlist = get_interface_list();
$checklist = get_configured_interface_list(false, true);
$realifchecklist = array();
foreach ($checklist as $tmpif)
- $realifchecklist[get_real_wan_interface($tmpif)] = $tmpif;
+ $realifchecklist[get_real_interface($tmpif)] = $tmpif;
$id = $_GET['id'];
if (isset($_POST['id']))
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index caf2044..67a4382 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -643,7 +643,7 @@ function fixup_string($string) {
$newstring = str_replace("\$myurl", $myurl, $string);
$string = $newstring;
// fixup #2: $wanip
- $curwanip = get_current_wan_address();
+ $curwanip = get_interface_ip();
$newstring = str_replace("\$wanip", $curwanip, $string);
$string = $newstring;
// fixup #3: $lanip
diff --git a/usr/local/www/widgets/include/log.inc b/usr/local/www/widgets/include/log.inc
index 74d7c17..e1e8c3f 100644
--- a/usr/local/www/widgets/include/log.inc
+++ b/usr/local/www/widgets/include/log.inc
@@ -19,11 +19,9 @@ function conv_clog_filter($logfile, $tail = 8) {
$logarr = "";
/* make interface/port table */
$iftable = array();
- $iftable[$config['interfaces']['lan']['if']] = "LAN";
- $iftable[get_real_wan_interface()] = "WAN";
- $iflist = get_configured_interface_with_descr(true);
+ $iflist = get_configured_interface_with_descr();
foreach ($iflist as $ifl => $ifdesc)
- $iftable[$config['interfaces'][$if]['if']] = $ifdesc;
+ $iftable[get_real_interface($ifl)] = $ifdesc;
$sor = isset($config['syslog']['reverse']) ? "-r" : "";
diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index c9dae67..9fd214f 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -614,7 +614,7 @@ function fixup_string($string) {
$myurl = $proto . "://" . $config['interfaces']['lan']['ipaddr'] . $urlport . "/";
$newstring = str_replace("\$myurl", $myurl, $newstring);
// fixup #2: $wanip
- $curwanip = get_current_wan_address();
+ $curwanip = get_interface_ip();
$newstring = str_replace("\$wanip", $curwanip, $newstring);
// fixup #3: $lanip
$lanip = $config['interfaces']['lan']['ipaddr'];
OpenPOWER on IntegriCloud