diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-10-23 21:51:53 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-10-23 21:51:53 +0000 |
commit | 85a5da131ccbbb6fe335da3ca7d67cc0c3f60aa0 (patch) | |
tree | 5599823fbfad08f8e11831c28d9e6caedd41bd1a /usr/local/pkg | |
parent | cb00b7342f39a96ddbffd3a53965c780359e2d3b (diff) | |
download | pfsense-85a5da131ccbbb6fe335da3ca7d67cc0c3f60aa0.zip pfsense-85a5da131ccbbb6fe335da3ca7d67cc0c3f60aa0.tar.gz |
* Rename get_current_wan_address to get_interface_ip
* Rename get_real_wan_interface to get_real_interface
* Simplify get_interface_ip by using find_interface_ip which should help in speed to since its using caching. Pointed by billm@
* Cleanup some code when passing or remove some unused one.
Diffstat (limited to 'usr/local/pkg')
-rw-r--r-- | usr/local/pkg/carp_settings.xml | 4 | ||||
-rw-r--r-- | usr/local/pkg/miniupnpd.inc | 4 |
2 files changed, 4 insertions, 4 deletions
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 = ''; |