From 2d816c13579c53925a9f3a0571bc57cf7aa28267 Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 16 Feb 2011 08:07:11 -0500 Subject: [PATCH 1/8] silence the music. --- etc/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/version b/etc/version index 0bd2631c99..813dceea4c 100644 --- a/etc/version +++ b/etc/version @@ -1 +1 @@ -2.0-BEAT5 +2.0-BETA5 From 3e8b3cccab55f02be654ba342ac9d0e02c719d78 Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 16 Feb 2011 11:31:21 -0500 Subject: [PATCH 2/8] Use a better regex here, sometimes ad devices can be numbered >=10. --- usr/local/www/diag_smart.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/www/diag_smart.php b/usr/local/www/diag_smart.php index 05239fa92f..d3da72b8ff 100644 --- a/usr/local/www/diag_smart.php +++ b/usr/local/www/diag_smart.php @@ -256,7 +256,7 @@ switch($action) default: { // Get all AD* and DA* (IDE and SCSI) devices currently installed and stores them in the $devs array - exec("ls /dev | grep '^[ad][da]*[0-9]$'", $devs); + exec("ls /dev | grep '^[ad][da][0-9]\{1,2\}$'", $devs); ?> From 72377228a61220f1dbe62afb81e0dc7757868ea5 Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 16 Feb 2011 12:15:37 -0500 Subject: [PATCH 3/8] Add automatic rules to pass DHCP failover traffic if a failover peer is defined. See http://forum.pfsense.org/index.php/topic,32731.msg172839.html#msg172839 --- etc/inc/filter.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index b786d964b0..b49de6bb8f 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2171,6 +2171,15 @@ pass in on \${$oc['descr']} proto udp from any port = 68 to {$oc['ip']} port = 6 pass out on \${$oc['descr']} proto udp from {$oc['ip']} port = 67 to any port = 68 label "allow access to DHCP server" EOD; + if($config['dhcpd'][$on]['failover_peerip'] <> "") { + $ipfrules .= << Date: Wed, 16 Feb 2011 13:04:08 -0500 Subject: [PATCH 4/8] Change this form to a POST instead of using GET with button inputs. For some reason using the GET method was causing things to be invoked twice, which led to two concurrent XMLRPC syncs, which can cause issues. --- usr/local/www/status_filter_reload.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usr/local/www/status_filter_reload.php b/usr/local/www/status_filter_reload.php index d1e54a9d22..aa6348b2d6 100644 --- a/usr/local/www/status_filter_reload.php +++ b/usr/local/www/status_filter_reload.php @@ -50,12 +50,12 @@ if($_GET['getstatus']) { echo "|{$status}|"; exit; } -if($_GET['reloadfilter']) { +if($_POST['reloadfilter']) { send_event("filter reload"); header("Location: status_filter_reload.php"); exit; } -if($_GET['syncfilter']) { +if($_POST['syncfilter']) { send_event("filter sync"); header("Location: status_filter_reload.php"); exit; @@ -68,11 +68,13 @@ include("head.inc");
- +
+      - + +


From a3bac4cea17f50d476f9475861c8992baba352e0 Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 16 Feb 2011 18:18:31 +0000 Subject: [PATCH 5/8] Do not rely on php new foreach by reference and use the old method of chaning array members by using full path. This fixes nat 1:1 upgrades. --- etc/inc/upgrade_config.inc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 0454475980..b5c492aa05 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2206,18 +2206,16 @@ function upgrade_069_to_070() { /* Convert NAT 1:1 rules */ if (is_array($config['nat']['onetoone'])) { - $a_nat = &$config['nat']['onetoone']; - - foreach ($a_nat as &$natent) { + foreach ($config['nat']['onetoone'] as $nidx => $natent) { if ($natent['subnet'] == 32) - $natent['source'] = array("address" => $natent['internal']); + $config['nat']['onetoone'][$nidx]['source'] = array("address" => $natent['internal']); else - $natent['source'] = array("address" => $natent['internal'] . "/" . $natent['subnet']); + $config['nat']['onetoone'][$nidx]['source'] = array("address" => $natent['internal'] . "/" . $natent['subnet']); - $natent['destination'] = array("any" => true); + $config['nat']['onetoone'][$nidx]['destination'] = array("any" => true); - unset($natent['internal']); - unset($natent['subnet']); + unset($config['nat']['onetoone'][$nidx]['internal']); + unset($config['nat']['onetoone'][$nidx]['subnet']); } unset($natent); From a8f9f07e61493f7349943d90fd615cc9eb7111ab Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 16 Feb 2011 13:52:22 -0500 Subject: [PATCH 6/8] Comment out the "config write on bootup" error. This is normal now with the package reinstall, and the known issues with it should be OK now. The error is just confusing people. --- etc/inc/config.lib.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index 1e584f298b..c527fd7a3b 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -479,8 +479,12 @@ function write_config($desc="Unknown", $backup = true) { * for now, since it was preventing config saving. */ // $config = parse_config(true, false, false); + /* Comment this check out for now. There aren't any current issues that + * make this problematic, and it makes users think there is a problem + * when one doesn't really exist. if($g['booting']) log_error("WARNING! Configuration written on bootup. This can cause stray openvpn and load balancing items in config.xml"); + */ $username = empty($_SESSION["Username"]) ? "(system)" : $_SESSION['Username']; From 3395ba20dd0b9483fce68e9992d1d2e850237cb7 Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 16 Feb 2011 15:32:56 -0500 Subject: [PATCH 7/8] Fix wording --- usr/local/www/system_firmware_settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php index 793b8fc8ce..492c34b068 100755 --- a/usr/local/www/system_firmware_settings.php +++ b/usr/local/www/system_firmware_settings.php @@ -157,11 +157,11 @@ function enable_altfirmwareurl(enable_over) {
- + From 0aba3822cfff6bed1cce0edee3d6814447e44979 Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 16 Feb 2011 16:22:11 -0500 Subject: [PATCH 8/8] Add IPsec and OpenVPN to packet capture. Ticket #1032 --- usr/local/www/diag_packet_capture.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index 835b99b1ba..8a9cb414a9 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -117,8 +117,18 @@ include("fbegin.inc");
/>
- +