Catch up

7 files changed, 37 insertions, 8 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 438b1c8..bd8aede 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -1786,7 +1786,7 @@ function filter_generate_user_rule($rule) {
 	}
 	update_filter_reload_status("Setting up pass/block rules");
 	$type = $rule['type'];
-	if($type != "pass" && $type != "block" && $type != "reject") {
+	if($type != "pass" && $type != "block" && $type != "reject" && $type != "match") {
 		/* default (for older rules) is pass */
 		$type = "pass ";
 	}
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index ea4940e..caf8006 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1677,13 +1677,8 @@ function reload_tunnel_spd_policy($phase1, $phase2, $old_phase1, $old_phase2) {
 	/* see if this tunnel has a hostname for the remote-gateway, and if so,
 	 * try to resolve it now and add it to the list for filterdns */
 	if (!is_ipaddr($phase1['remote-gateway'])) {
-		if(! $g['booting']) {
-			$rgip = resolve_retry($phase1['remote-gateway']);
-			add_hostname_to_watch($phase1['remote-gateway']);
-			return false;
-		} else {
-			add_hostname_to_watch($phase1['remote-gateway']);
-		}
+		$rgip = resolve_retry($phase1['remote-gateway']);
+		add_hostname_to_watch($phase1['remote-gateway']);
 		if (!$rgip) {
 			log_error("Could not determine VPN endpoint for '{$phase1['descr']}'");
 			return false;
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 38f256e..d213377 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -199,6 +199,9 @@ if ($_POST) {
 	if ($_POST['type'] == "reject" && $_POST['proto'] <> "tcp")
 		$input_errors[] = gettext("Reject type rules only works when the protocol is set to TCP.");
 
+	if ($_POST['type'] == "match" && $_POST['defaultqueue'] == "none")
+		$input_errors[] = gettext("Queue type rules only work with queues.");
+
 	if (($_POST['proto'] != "tcp") && ($_POST['proto'] != "udp") && ($_POST['proto'] != "tcp/udp")) {
 		$_POST['srcbeginport'] = 0;
 		$_POST['srcendport'] = 0;
@@ -609,6 +612,9 @@ include("head.inc");
 					<?=htmlspecialchars($type);?>
 					</option>
 					<?php endforeach; ?>
+<?php if ($if == "FloatingRules" || isset($pconfig['floating'])): ?>
+					<option value="match" <?php if ("match" == strtolower($pconfig['type'])) echo "selected"; ?>>Queue</option>
+<?php endif; ?>
 				</select>
 				<br/>
 				<span class="vexpl">
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc
index b684fb6..7869309 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard.inc
@@ -949,6 +949,7 @@ function apply_all_choosen_items() {
 			if ($penalty) {
 				if( is_ipaddr($config['ezshaper']['step4']['address']) || is_alias($config['ezshaper']['step4']['address'])) {
 				    $rule = array();
+				    $rule['type'] = "match";
 				    $rule['descr'] = gettext("Penalty Box");
 				    $rule['direction'] = "out";
 				    $rule['source']['any'] = TRUE;
@@ -968,6 +969,7 @@ function apply_all_choosen_items() {
 				if( is_ipaddr($config['ezshaper']['step3']['address']) || is_alias($config['ezshaper']['step3']['address'])) {
 					/* create VOIP rules */
 					$rule = array();
+				        $rule['type'] = "match";
 					$rule['descr'] = gettext("VOIP Adapter");
 					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
@@ -982,6 +984,7 @@ function apply_all_choosen_items() {
 				} elseif( $config['ezshaper']['step3']['provider'] == "Generic" ) {
 					/* create VOIP rules */
 					$rule = array();
+					    $rule['type'] = "match";
 					$rule['descr'] = "DiffServ/Lowdelay/Upload";
 					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
@@ -998,6 +1001,7 @@ function apply_all_choosen_items() {
 					/* loop through voiplist[] */
 					foreach ($voiplist[$config['ezshaper']['step3']['provider']] as $voip) {
 						$rule = array();
+						$rule = array();
 						$rule['defaultqueue'] = 'qVoIP';
 						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
@@ -1021,6 +1025,7 @@ function apply_all_choosen_items() {
 						continue;
 					foreach ($p2plist[$key] as $p2pclient) {
 						$rule = array();
+						$rule = array();
 						$rule['defaultqueue'] = 'qP2P';
 						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;		
@@ -1043,6 +1048,7 @@ function apply_all_choosen_items() {
 										continue;
 					foreach ($gamesplist[$key] as $Gameclient) {
 						$rule = array();
+						$rule = array();
 						$rule['defaultqueue'] = 'qGames';
 						if ($Gameclient[1] == "tcp")
 							$rule['ackqueue'] = 'qACK';
@@ -1068,6 +1074,7 @@ function apply_all_choosen_items() {
 						continue;
 					foreach ($othersplist[$key] as $otherclient) {
 						$rule = array();
+						$rule = array();
 						switch ($val) {
 						case "H":
 							$rule['defaultqueue'] = 'qOthersHigh'; /* posted value H or L */
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index b59c5a7..88a6296 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -1006,6 +1006,7 @@ function apply_all_choosen_items() {
 			if ($penalty) {
 				if( is_ipaddr($config['ezshaper']['step4']['address']) || is_alias($config['ezshaper']['step4']['address'])) {
 				    $rule = array();
+				    $rule['type'] = "match";
 				    $rule['descr'] = gettext("Penalty Box");
 				    $rule['direction'] = "out";
 				    $rule['source']['any'] = TRUE;
@@ -1025,6 +1026,7 @@ function apply_all_choosen_items() {
 				if( is_ipaddr($config['ezshaper']['step3']['address']) || is_alias($config['ezshaper']['step3']['address'])) {
 					/* create VOIP rules */
 					$rule = array();
+					$rule['type'] = "match";
 					$rule['descr'] = gettext("VOIP Adapter");
 					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
@@ -1039,6 +1041,7 @@ function apply_all_choosen_items() {
 				} elseif( $config['ezshaper']['step3']['provider'] == "Generic" ) {
 					/* create VOIP rules */
 					$rule = array();
+					$rule['type'] = "match";
 					$rule['descr'] = "DiffServ/Lowdelay/Upload";
 					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
@@ -1055,6 +1058,7 @@ function apply_all_choosen_items() {
 					/* loop through voiplist[] */
 					foreach ($voiplist[$config['ezshaper']['step3']['provider']] as $voip) {
 						$rule = array();
+						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qVoIP';
 						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
@@ -1078,6 +1082,7 @@ function apply_all_choosen_items() {
 						continue;
 					foreach ($p2plist[$key] as $p2pclient) {
 						$rule = array();
+						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qP2P';
 						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;		
@@ -1100,6 +1105,7 @@ function apply_all_choosen_items() {
 										continue;
 					foreach ($gamesplist[$key] as $Gameclient) {
 						$rule = array();
+						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qGames';
 						if ($Gameclient[1] == "tcp")
 							$rule['ackqueue'] = 'qACK';
@@ -1125,6 +1131,7 @@ function apply_all_choosen_items() {
 						continue;
 					foreach ($othersplist[$key] as $otherclient) {
 						$rule = array();
+						$rule['type'] = "match";
 						switch ($val) {
 						case "H":
 							$rule['defaultqueue'] = 'qOthersHigh'; /* posted value H or L */
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
index c6347da..f33283a 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -1039,6 +1039,7 @@ function apply_all_choosen_items() {
 			if ($penalty) {
 				if( is_ipaddr($config['ezshaper']['step4']['address']) || is_alias($config['ezshaper']['step4']['address'])) {
 				    $rule = array();
+				    $rule['type'] = "match";
 				    $rule['descr'] = gettext("Penalty Box");
 				    $rule['direction'] = "out";
 				    $rule['source']['any'] = TRUE;
@@ -1058,6 +1059,7 @@ function apply_all_choosen_items() {
 				if( is_ipaddr($config['ezshaper']['step3']['address']) || is_alias($config['ezshaper']['step3']['address'])) {
 					/* create VOIP rules */
 					$rule = array();
+					$rule['type'] = "match";
 					$rule['descr'] = gettext("VOIP Adapter");
 					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
@@ -1072,6 +1074,7 @@ function apply_all_choosen_items() {
 				} elseif( $config['ezshaper']['step3']['provider'] == "Generic" ) {
 					/* create VOIP rules */
 					$rule = array();
+					$rule['type'] = "match";
 					$rule['descr'] = "DiffServ/Lowdelay/Upload";
 					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
@@ -1088,6 +1091,7 @@ function apply_all_choosen_items() {
 					/* loop through voiplist[] */
 					foreach ($voiplist[$config['ezshaper']['step3']['provider']] as $voip) {
 						$rule = array();
+						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qVoIP';
 						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
@@ -1111,6 +1115,7 @@ function apply_all_choosen_items() {
 						continue;
 					foreach ($p2plist[$key] as $p2pclient) {
 						$rule = array();
+						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qP2P';
 						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;		
@@ -1133,6 +1138,7 @@ function apply_all_choosen_items() {
 										continue;
 					foreach ($gamesplist[$key] as $Gameclient) {
 						$rule = array();
+						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qGames';
 						if ($Gameclient[1] == "tcp")
 							$rule['ackqueue'] = 'qACK';
@@ -1158,6 +1164,7 @@ function apply_all_choosen_items() {
 						continue;
 					foreach ($othersplist[$key] as $otherclient) {
 						$rule = array();
+						$rule['type'] = "match";
 						switch ($val) {
 						case "H":
 							$rule['defaultqueue'] = 'qOthersHigh'; /* posted value H or L */
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
index a5de47e..ab22b93 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
@@ -1178,6 +1178,7 @@ function apply_all_choosen_items() {
 		if ($penalty) {
 			if( is_ipaddr($config['ezshaper']['step4']['address']) || is_alias($config['ezshaper']['step4']['address'])) {
 			    $rule = array();
+			    $rule['type'] = "match";
 			    $rule['descr'] = gettext("Penalty Box");
 			    $rule['direction'] = "out";
 			    $rule['source']['any'] = TRUE;
@@ -1197,6 +1198,7 @@ function apply_all_choosen_items() {
 			if( is_ipaddr($config['ezshaper']['step3']['address']) || is_alias($config['ezshaper']['step3']['address'])) {
 				/* create VOIP rules */
 				$rule = array();
+				$rule['type'] = "match";
 				$rule['descr'] = gettext("VOIP Adapter");
 				$rule['direction'] = "out";
 				$rule['protocol'] = "udp";
@@ -1211,6 +1213,7 @@ function apply_all_choosen_items() {
 			} elseif( $config['ezshaper']['step3']['provider'] == "Generic" ) {
 				/* create VOIP rules */
 				$rule = array();
+				$rule['type'] = "match";
 				$rule['descr'] = "DiffServ/Lowdelay/Upload";
 				$rule['direction'] = "out";
 				$rule['protocol'] = "udp";
@@ -1227,6 +1230,7 @@ function apply_all_choosen_items() {
 				/* loop through voiplist[] */
 				foreach ($voiplist[$config['ezshaper']['step3']['provider']] as $voip) {
 					$rule = array();
+					$rule['type'] = "match";
 					$rule['defaultqueue'] = 'qVoIP';
 					$rule['direction'] = "out";
 					$rule['source']['any'] = TRUE;
@@ -1250,6 +1254,7 @@ function apply_all_choosen_items() {
 					continue;
 				foreach ($p2plist[$key] as $p2pclient) {
 					$rule = array();
+					$rule['type'] = "match";
 					$rule['defaultqueue'] = 'qP2P';
 					$rule['direction'] = "out";
 					$rule['source']['any'] = TRUE;		
@@ -1272,6 +1277,7 @@ function apply_all_choosen_items() {
 									continue;
 				foreach ($gamesplist[$key] as $Gameclient) {
 					$rule = array();
+					$rule['type'] = "match";
 					$rule['defaultqueue'] = 'qGames';
 					if ($Gameclient[1] == "tcp")
 						$rule['ackqueue'] = 'qACK';
@@ -1297,6 +1303,7 @@ function apply_all_choosen_items() {
 					continue;
 				foreach ($othersplist[$key] as $otherclient) {
 					$rule = array();
+					$rule['type'] = "match";
 					switch ($val) {
 					case "H":
 						$rule['defaultqueue'] = 'qOthersHigh'; /* posted value H or L */