summaryrefslogtreecommitdiffstats
path: root/usr/local/www/guiconfig.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-07-08 12:38:27 -0300
committerRenato Botelho <garga@FreeBSD.org>2013-07-08 12:38:37 -0300
commitdd042c5159fb61ccb1a9b3867b18263685703b7b (patch)
tree070118ecc373e61437cadd6d52a738ab3c03e1ed /usr/local/www/guiconfig.inc
parentff6c98526e026b634f3d1c89163bf850bdd7a2ba (diff)
downloadpfsense-dd042c5159fb61ccb1a9b3867b18263685703b7b.zip
pfsense-dd042c5159fb61ccb1a9b3867b18263685703b7b.tar.gz
Implement URL Table aliases for ports instead of IP addresses
Diffstat (limited to 'usr/local/www/guiconfig.inc')
-rwxr-xr-xusr/local/www/guiconfig.inc13
1 files changed, 10 insertions, 3 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 0da6d1e..f88572b 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -1030,9 +1030,16 @@ function alias_info_popup($alias_id){
$alias_name=$config['aliases']['alias'][$alias_id];
$alias_objects_with_details = "<table width=\"100%\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\" summary=\"alias info popup\">";
if ($alias_name['url']) {
- exec("/sbin/pfctl -t {$alias_name['name']} -T show | wc -l", $total_entries);
- $counter=preg_replace("/\D/","",$total_entries[0]);
- exec("/sbin/pfctl -t {$alias_name['name']} -T show | head -10002", $alias_addresses);
+ // TODO: Change it when pf supports tables with ports
+ if ($alias_name['type'] == "urltable") {
+ exec("/sbin/pfctl -t {$alias_name['name']} -T show | wc -l", $total_entries);
+ $counter=preg_replace("/\D/","",$total_entries[0]);
+ exec("/sbin/pfctl -t {$alias_name['name']} -T show | head -10002", $alias_addresses);
+ } else {
+ $urlfn = alias_expand_urltable($alias_name['name']);
+ $alias_addresses = explode("\n", file_get_contents($urlfn));
+ $counter = count($alias_addresses);
+ }
$alias_objects_with_details .= "<tr><td colspan=\"3\" $close_title class=\"vncell\">{$alias_name['url']}</td></tr>";
$x=0;
foreach ($alias_addresses as $alias_ports_address ) {
OpenPOWER on IntegriCloud