Fixes #2428. Reference limiters in rules by name to avoid issues. Also put upgrade code for existing configs. The same fix is necessary for 2.0.x though not sure how this should be committed there.

1 files changed, 92 insertions, 82 deletions

diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index b325a30..ded2d04 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -95,56 +95,56 @@ $output_form = "";
 if ($_GET) {
 	switch ($action) {
 	case "delete":
-			if ($queue) {
-				if (is_array($config['filter']['rule'])) {
-					foreach ($config['filter']['rule'] as $rule) {
-						if ($rule['dnpipe'] == $queue->GetNumber() || $rule['pdnpipe'] == $queue->GetNumber())
-							$input_errors[] = gettext("This pipe/queue is referenced in filter rules, please remove references from there before deleteing.");
-					}
-				}
-				if (!$input_errors) {
-					$queue->delete_queue();
-					write_config();
-					mark_subsystem_dirty('shaper');
-					header("Location: firewall_shaper_vinterface.php");
-					exit;
+		if ($queue) {
+			if (is_array($config['filter']['rule'])) {
+				foreach ($config['filter']['rule'] as $rule) {
+					if ($rule['dnpipe'] == $queue->GetName() || $rule['pdnpipe'] == $queue->GetName())
+						$input_errors[] = gettext("This pipe/queue is referenced in filter rules, please remove references from there before deleteing.");
 				}
-				$output_form .= $queue->build_form();
-			} else {
-				$input_errors[] = sprintf(gettext("No queue with name %s was found!"),$qname);
-				$output_form .= "<p class=\"pgtitle\">" . $dn_default_shaper_msg."</p>";
-				$dontshow = true;
 			}
+			if (!$input_errors) {
+				$queue->delete_queue();
+				write_config();
+				mark_subsystem_dirty('shaper');
+				header("Location: firewall_shaper_vinterface.php");
+				exit;
+			}
+			$output_form .= $queue->build_form();
+		} else {
+			$input_errors[] = sprintf(gettext("No queue with name %s was found!"),$qname);
+			$output_form .= "<p class=\"pgtitle\">" . $dn_default_shaper_msg."</p>";
+			$dontshow = true;
+		}
 		break;
 	case "resetall":
-			foreach ($dummynet_pipe_list as $dn)
-				$dn->delete_queue();
-			unset($dummynet_pipe_list);
-			$dummynet_pipe_list = array();
-			unset($config['dnshaper']['queue']);
-			unset($queue);
-			unset($pipe);
-			$can_add = false;
-			$can_enable = false;
-			$dontshow = true;
-			foreach ($config['filter']['rule'] as $key => $rule) {
-				if (isset($rule['dnpipe']))
-					unset($config['filter']['rule'][$key]['dnpipe']);
-				if (isset($rule['pdnpipe']))
-					unset($config['filter']['rule'][$key]['pdnpipe']);
-			}
-			write_config();
-			
-			$retval = 0;
-                        $retval = filter_configure();
-                        $savemsg = get_std_save_message($retval);
+		foreach ($dummynet_pipe_list as $dn)
+			$dn->delete_queue();
+		unset($dummynet_pipe_list);
+		$dummynet_pipe_list = array();
+		unset($config['dnshaper']['queue']);
+		unset($queue);
+		unset($pipe);
+		$can_add = false;
+		$can_enable = false;
+		$dontshow = true;
+		foreach ($config['filter']['rule'] as $key => $rule) {
+			if (isset($rule['dnpipe']))
+				unset($config['filter']['rule'][$key]['dnpipe']);
+			if (isset($rule['pdnpipe']))
+				unset($config['filter']['rule'][$key]['pdnpipe']);
+		}
+		write_config();
+		
+		$retval = 0;
+		$retval = filter_configure();
+		$savemsg = get_std_save_message($retval);
 
-                        if (stristr($retval, "error") <> true)
-	                        $savemsg = get_std_save_message($retval);
-                        else
-       	                	$savemsg = $retval;
-			
-			$output_form = $dn_default_shaper_message;
+		if (stristr($retval, "error") <> true)
+			$savemsg = get_std_save_message($retval);
+		else
+			$savemsg = $retval;
+
+		$output_form = $dn_default_shaper_message;
 
 		break;
 	case "add":
@@ -159,11 +159,11 @@ if ($_GET) {
 		} else 
 			$input_errors[] = gettext("Could not create new queue/discipline!");
 
-			if ($q) {
-				$output_form .= $q->build_form();
-                unset($q);
-				$newqueue = true;
-			}
+		if ($q) {
+			$output_form .= $q->build_form();
+			unset($q);
+			$newqueue = true;
+		}
 		break;
 	case "show":
 		if ($queue)  
@@ -173,21 +173,23 @@ if ($_GET) {
 		break;
 	case "enable":
 		if ($queue) {
-				$queue->SetEnabled("on");
-				$output_form .= $queue->build_form();
-				write_config();
-				mark_subsystem_dirty('shaper');
+			$queue->SetEnabled("on");
+			$output_form .= $queue->build_form();
+			$queue->wconfig();
+			write_config();
+			mark_subsystem_dirty('shaper');
 		} else
-				$input_errors[] = gettext("Queue not found!");
+			$input_errors[] = gettext("Queue not found!");
 		break;
 	case "disable":
 		if ($queue) {
-				$queue->SetEnabled("");
-				$output_form .= $queue->build_form();
-				write_config();
-				mark_subsystem_dirty('shaper');
+			$queue->SetEnabled("");
+			$output_form .= $queue->build_form();
+			$queue->wconfig();
+			write_config();
+			mark_subsystem_dirty('shaper');
 		} else
-				$input_errors[] = gettext("Queue not found!");
+			$input_errors[] = gettext("Queue not found!");
 		break;
 	default:
 		$output_form .= "<p class=\"pgtitle\">" . $dn_default_shaper_msg."</p>";
@@ -198,25 +200,33 @@ if ($_GET) {
 	unset($input_errors);
 
 	if ($addnewpipe) {
-		$dnpipe =& new dnpipe_class();
-		
-		$dnpipe->ReadConfig($_POST);
-		$dnpipe->validate_input($_POST, &$input_errors);
-		if (!$input_errors) {
-			unset($tmppath);
-			$tmppath[] = $dnpipe->GetQname();
-			$dnpipe->SetLink(&$tmppath);	
-			$dnpipe->wconfig();
-			write_config();
-			mark_subsystem_dirty('shaper');
-			$can_enable = true;
-       		     	$can_add = true;
+		if (!empty($dummynet_pipe_list[$qname]))
+			$input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter");
+		else {
+			$dnpipe =& new dnpipe_class();
+			
+			$dnpipe->ReadConfig($_POST);
+			$dnpipe->validate_input($_POST, &$input_errors);
+			if (!$input_errors) {
+				$number = dnpipe_find_nextnumber();
+				$dnpipe->SetNumber($number);
+				unset($tmppath);
+				$tmppath[] = $dnpipe->GetQname();
+				$dnpipe->SetLink(&$tmppath);	
+				$dnpipe->wconfig();
+				write_config();
+				mark_subsystem_dirty('shaper');
+				$can_enable = true;
+				$can_add = true;
+			}
+			
+			read_dummynet_config();
+			$output_form .= $dnpipe->build_form();
 		}
-		read_dummynet_config();
-		$output_form .= $dnpipe->build_form();
-
 	} else if ($parentqueue) { /* Add a new queue */
-		if ($dnpipe) {
+		if (!empty($dummynet_pipe_list[$qname]))
+			$input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter");
+		else if ($dnpipe) {
 			$tmppath =& $dnpipe->GetLink();
 			array_push($tmppath, $qname);
 			$tmp =& $dnpipe->add_queue($pipe, $_POST, $tmppath, &$input_errors);
@@ -262,11 +272,11 @@ if ($_GET) {
 	} else if ($queue) {
                 $queue->validate_input($_POST, &$input_errors);
                 if (!$input_errors) {
-                            	$queue->update_dn_data($_POST);
-                            	$queue->wconfig();
-				write_config();
-				mark_subsystem_dirty('shaper');
-				$dontshow = false;
+			$queue->update_dn_data($_POST);
+			$queue->wconfig();
+			write_config();
+			mark_subsystem_dirty('shaper');
+			$dontshow = false;
                 } 
 		read_dummynet_config();
 		$output_form .= $queue->build_form();