diff options
| -rw-r--r-- | etc/inc/filter.inc | 10 | ||||
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 1 | ||||
| -rwxr-xr-x | etc/rc.newwanip | 2 | ||||
| -rwxr-xr-x | usr/local/www/diag_logs_filter.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/pkg_edit.php | 1 |
5 files changed, 1 insertions, 15 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 77052a3..26f410d 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -38,12 +38,6 @@ require_once("functions.inc"); require_once("pkg-utils.inc"); require_once("notices.inc"); -function filter_resync() { - global $config, $g; - - mwexec("/sbin/pfctl -y"); /* XXX */ -} - function filter_pflog_start() { global $config, $g; @@ -1859,9 +1853,6 @@ EOD; # PPTPd rules anchor "pptp" -#pass quick proto gre from any to $pptpdtarget keep state label "allow gre pptpd" -#pass quick proto tcp from any to $pptpdtarget port = 1723 keep state label "allow pptpd $pptpdtarget" -# XXX: fix me! pass quick proto gre from any to any keep state label "allow gre pptpd" pass quick proto tcp from any to any port = 1723 keep state label "allow pptpd $pptpdtarget" @@ -2286,7 +2277,6 @@ function return_vpn_subnet($adr) { return $padr . "/" . $pmask; } - /* XXX: do not return wan, lan, etc */ if(strstr($adr['network'], "wan") or strstr($adr['network'], "lan") or strstr($adr['network'], "opt")) return convert_ip_to_network_format($config['interfaces'][$adr['network']]['ipaddr'], $config['interfaces'][$adr['network']]['subnet']); diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index f5ae170..d7158ce 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -430,7 +430,6 @@ function get_carp_interface_status($carpinterface) { if(stristr($int, $carpinterface) == true) $found_interface=1; } - /* XXX: Should never reach this */ return; } diff --git a/etc/rc.newwanip b/etc/rc.newwanip index 89fda6e..74ee119 100755 --- a/etc/rc.newwanip +++ b/etc/rc.newwanip @@ -53,7 +53,7 @@ system_start_ftp_helpers(); /* resync ipfilter */ - filter_resync(); + filter_configure_sync(); /* reconfigure IPsec tunnels */ vpn_ipsec_configure(true); diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 5c3c07c..1bb1e7c 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -34,7 +34,6 @@ require("guiconfig.inc"); $filter_logfile = "{$g['varlog_path']}/filter.log"; -//exec("/usr/sbin/tcpdump -n -e -ttt -r {$g['varlog_path']}/pflog | logger -t pf -p local0.info "); $nentries = $config['syslog']['nentries']; if (!$nentries) @@ -75,7 +74,6 @@ function conv_clog($logfile, $tail) { if(stristr($logent, "UDP") == true) $flent['proto'] = "UDP"; - /* XXX: fetch time? */ $flent['time'] = $log_split[1]; $flent['act'] = $log_split[3]; $flent['interface'] = strtoupper(convert_real_interface_to_friendly_interface_name(str_replace(":","",$log_split[4]))); diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index dbb167f..996f244 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -309,7 +309,6 @@ if ($pkg['tabs'] <> "") { echo "<input type='password' " . $size . " name='" . $pkga['fieldname'] . "' value='" . $value . "'>\n"; echo "<br>" . fixup_string($pkga['description']) . "\n"; } else if($pkga['type'] == "select") { - // XXX: TODO: set $selected if($pkga['size']) $size = " size='" . $pkga['size'] . "' "; if($pkga['multiple'] == "yes") $multiple = "MULTIPLE "; echo "<select " . $multiple . $size . "id='" . $pkga['fieldname'] . "' name='" . $pkga['fieldname'] . "'>\n"; |
