This patch adds the initial support for layer7 protocol inspection gui.

author: Helder Pereira <helder.lesi@gmail.com> 2008-12-20 23:57:09 +0000
committer: Helder Pereira <helder.lesi@gmail.com> 2008-12-20 23:57:09 +0000
commit: f63d5b66b49abe5190703d9d251b7e2d462e993b (patch)
tree: 1f58463ec12462516df5cd20fe724bf22862536b /usr
parent: adc986ed5e5bb1de0e478dc1e3abf4f493ca1c3f (diff)
download: pfsense-f63d5b66b49abe5190703d9d251b7e2d462e993b.zip
pfsense-f63d5b66b49abe5190703d9d251b7e2d462e993b.tar.gz
6 files changed, 730 insertions, 4 deletions
diff --git a/usr/local/www/diag_patterns.php b/usr/local/www/diag_patterns.php
new file mode 100755
index 0000000..551fc44
--- /dev/null
+++ b/usr/local/www/diag_patterns.php
@@ -0,0 +1,130 @@
+<?php
+/* $Id$ */
+/*
+	Exec+ v1.02-000 - Copyright 2001-2003, All rights reserved
+	Created by André Ribeiro and Hélder Pereira
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+##|+PRIV
+##|*IDENT=page-diagnostics-patters
+##|*NAME=Diagnostics: Patterns page
+##|*DESCR=Allow access to the 'Diagnostics: Patterns' page.
+##|*MATCH=patterns.php*
+##|-PRIV
+
+
+require("guiconfig.inc");
+
+//Move the upload file to /usr/local/share/protocols (is_uploaded_file must use tmp_name as argument)
+if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
+	if(fileExtension($_FILES['ulfile']['name'])) {
+		move_uploaded_file($_FILES['ulfile']['tmp_name'], "/usr/local/share/protocols/" . $_FILES['ulfile']['name']);
+		$ulmsg = "Uploaded file to /usr/local/share/protocols/" . htmlentities($_FILES['ulfile']['name']);
+	}
+	else
+		$ulmsg = "Warning: You must upload a file with .pat extension.";
+}
+
+//Check if file has correct extension (.pat)
+function fileExtension($nameFile) {
+	$format = substr($nameFile, -4);	
+	return ($format == ".pat");	
+}
+
+$pgtitle = array("Diagnostics","Add layer7 pattern");
+include("head.inc");
+?>
+
+
+<style>
+<!--
+
+input {
+   font-family: courier new, courier;
+   font-weight: normal;
+   font-size: 9pt;
+}
+
+pre {
+   border: 2px solid #435370;
+   background: #F0F0F0;
+   padding: 1em;
+   font-family: courier new, courier;
+   white-space: pre;
+   line-height: 10pt;
+   font-size: 10pt;
+}
+
+.label {
+   font-family: tahoma, verdana, arial, helvetica;
+   font-size: 11px;
+   font-weight: bold;
+}
+
+.button {
+   font-family: tahoma, verdana, arial, helvetica;
+   font-weight: bold;
+   font-size: 11px;
+}
+
+-->
+</style>
+</head>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p><strong>You can upload new layer7 patterns to your system!</strong></p>
+<?php if ($ulmsg) echo "<p class=\"red\"><strong>" . $ulmsg . "</strong></p>\n"; ?>
+
+
+<div id="niftyOutter">
+<form action="diag_patterns.php" method="POST" enctype="multipart/form-data" name="frmPattern">
+  <table>
+	
+  <tr>
+    <td colspan="2" valign="top" class="vnsepcell">Upload</td>
+  </tr>    
+    <tr>
+      <td align="right">File to upload:</td>
+      <td valign="top" class="label">
+	<input name="ulfile" type="file" class="formfld file" id="ulfile">
+	</td></tr>
+    <tr>
+      <td valign="top">&nbsp;&nbsp;&nbsp;</td>
+      <td valign="top" class="label">	
+        <input name="submit" type="submit"  class="button" id="upload" value="Upload"></td>
+    </tr>
+	<tr>
+	  <td colspan="2" valign="top" height="16"></td>
+	</tr>
+	    
+  </table>
+</div>
+<?php include("fend.inc"); ?>
+</form>
+</body>
+</html>
+
+<?php
+
+?>
diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index 9f74264..ec803a1 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -424,7 +424,8 @@ include("fbegin.inc");
 	$tab_array[0] = array("By Interface", true, "firewall_shaper.php");
 	$tab_array[1] = array("By Queue", false, "firewall_shaper_queues.php");
 	$tab_array[2] = array("Limiter", false, "firewall_shaper_vinterface.php");
-	$tab_array[3] = array("Wizards", false, "firewall_shaper_wizards.php");
+	$tab_array[3] = array("Layer7", false, "firewall_shaper_layer7.php");
+	$tab_array[4] = array("Wizards", false, "firewall_shaper_wizards.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php
new file mode 100755
index 0000000..71574ec
--- /dev/null
+++ b/usr/local/www/firewall_shaper_layer7.php
@@ -0,0 +1,592 @@
+<?php
+/* $Id$ */
+/*
+	firewall_shaper_layer7.php
+	Copyright (C) 2008 Helder Pereira, André Ribeiro
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+##|+PRIV
+##|*IDENT=page-firewall-trafficshaper-layer7
+##|*NAME=Firewall: Traffic Shaper: Layer7 page
+##|*DESCR=Allow access to the 'Firewall: Traffic Shaper: Layer7' page.
+##|*MATCH=firewall_shaper_layer7.php*
+##|-PRIV
+
+require("guiconfig.inc");
+
+// Variables protocols (dynamic) and structures (static)
+$avail_protos =& generate_protocols_array();
+$avail_structures = array("action","queue","limiter");
+
+// Available behaviours
+$avail_behaviours_action = array("allow","block");
+read_altq_config();
+$avail_behaviours_altq = get_altq_name_list();
+read_dummynet_config();
+$avail_behaviours_limiter = get_dummynet_name_list();
+$show_proto_form = false;
+
+
+//More variables
+$pgtitle = array("Firewall","Traffic Shaper", "Layer7");
+
+$output_form = "";
+
+$default_layer7shaper_msg = "<tr><td colspan=\"4\">";
+$default_layer7shaper_msg .= "<p><span class=\"vexpl\"><span class=\"red\"><strong>Note:<br>";
+$default_layer7shaper_msg .= "</strong></span>You can add new layer7 protocol patterns by simply uploading the file <a href=\"diag_patterns.php\">here.</a><br>";
+$default_layer7shaper_msg .= "</td></tr>";
+
+
+read_layer7_config();
+
+if($_GET['reset'] <> "") {
+        mwexec("killall -9 pfctl php");
+	mwexec("killall -9 ipfw-classifyd"); //kill all ipfw-classifyd processes
+	exit;
+}
+
+if ($_GET) {
+	if ($_GET['container'])
+        	$name = trim($_GET['container']);        
+        if ($_GET['action'])
+                $action = $_GET['action'];
+}
+
+if($_POST) {
+	if ($_POST['container']) {
+		$name = trim($_POST['container']);
+	}
+}
+
+if ($name) {
+	//Get the object from the 7rules list
+	$container = $layer7_rules_list[$name];
+}
+
+
+if ($_GET) {
+	switch ($action) {
+		case "add":
+			$show_proto_form = true;
+			$container = new layer7();
+			$output_form .= $container->build_form(); //constructs the graphical interface on the right side
+			unset($container);
+			break;
+		case "show":
+			$show_proto_form = true;
+			if($container) {
+				$output_form .= $container->build_form();
+			}
+			else {
+				$show_proto_form = false;
+				$input_errors[] = "Layer7 Rules Container not found!";
+			}
+			break;
+		default:
+			echo log_error("Get default");
+			$show_proto_form = false;
+			$output_form .= "<p class=\"pgtitle\">" . $dn_default_shaper_msg . $default_layer7shaper_msg . "</p>";
+			break;
+	}
+}
+
+//add a new l7rules container
+else if ($_POST) {
+	$show_proto_form = true;
+	unset($input_errors);
+	
+	if($_POST['submit']) {
+		$l7r =& new layer7();
+		$_POST['divert_port'] = $l7r->gen_divert_port();
+		for($i=0; $i<100; $i++) {
+			if($_POST['protocol'][$i] <> "") {
+				$_POST['l7rules'][$i]['protocol'] = $_POST['protocol'][$i];
+				$_POST['l7rules'][$i]['structure'] = $_POST['structure'][$i];
+				$_POST['l7rules'][$i]['behaviour'] = $_POST['behaviour'][$i];
+			}
+			else {
+				break;
+			}
+		}
+		$l7r->validate_input($_POST,&$input_errors);
+		$l7r->ReadConfig($_POST['container'], $_POST);
+		//Before writing the results, we need to test for repeated protocols
+		$non_dupes = array();
+		$dupes = array();
+		for($j=0; $j<$i; $j++) {
+			if(!$non_dupes[$_POST['protocol'][$j]])
+				$non_dupes[$_POST['protocol'][$j]] = true;
+			else
+				$dupes[] = $_POST['protocol'][$j];
+		}
+		unset($non_dupes);
+		if(sizeof($dupes) == 0 && !$input_errors) {
+			$l7r->wconfig();
+			write_config();
+			touch($d_shaperconfdirty_path);
+		
+			read_layer7_config();
+		}
+		else {
+			if(sizeof($dupes) > 0) {
+				$dupe_error = "Found the following repeated protocol definitions: ";
+				foreach($dupes as $dupe)
+					$dupe_error .= "$dupe ";
+				$input_errors[] .= $dupe_error;
+			}
+		}
+		unset($dupes);
+		unset($dupe_error);
+		//Even if there are repeated protocols, we won't loose any previous values
+		//The user will be able to solve the situation
+		$output_form .= $l7r->build_form();
+		//Necessary to correctly build the proto form
+		$container = $layer7_rules_list[$name];
+		if($input_errors)
+			$container =& $l7r;
+	} else if($_POST['apply']) {
+		write_config();
+
+		$retval = 0;
+		$savemsg = get_std_save_message($retval);
+			
+		config_lock();
+		$retval = filter_configure();
+		config_unlock();
+			
+		if(stristr($retval, "error") <> true)
+			$savemsg = get_std_save_message($retval);
+		else
+			$savemsg = $retval;
+
+		unlink($d_shaperconfdirty_path);
+		
+		if($container) {
+			$output_form .= $container->build_form();
+		} else {
+			$show_proto_form = false;
+			$output_form .= "<p class=\"pgtitle\">" . $dn_default_shaper_msg . $default_layer7shaper_msg . "</p>";
+		}
+	} else if ($_POST['delete']) {
+		$container->delete_l7c();
+		write_config();
+		touch($d_shaperconfdirty_path);
+		unset($container);
+		
+		header("Location: firewall_shaper_layer7.php");
+		exit;
+	}
+	else {
+		$show_proto_form = false;
+	}
+}
+else {
+	$show_proto_form = false;
+	$output_form .= "<p class=\"pgtitle\">" . $dn_default_shaper_msg . $default_layer7shaper_msg . "</p>";
+}
+
+// Builds the left tree
+$tree = "<ul class=\"tree\" >";
+if (is_array($layer7_rules_list)) {
+        foreach ($layer7_rules_list as $tmpl7) {
+                $tree .= $tmpl7->build_tree();
+        }
+}
+$tree .= "</ul>";
+
+$output = "<div id=\"shaperarea\" style=\"position:relative\">";
+$output .= $output_form;
+
+include("head.inc");
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC" >
+<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" />
+<script type="text/javascript" src="./tree/tree.js"></script>
+                                        
+<script language="javascript">
+
+var initial_count = new Array();
+var rows_limit = 0; // Set to 0 to disable limitation
+
+
+/* Build the behaviours arrays in javascript */
+var js_behaviours_action = ['allow', 'block']; //static
+
+var js_behaviours_altq = new Array();
+js_behaviours_altq = array_altq(js_behaviours_altq);
+
+var js_behaviours_limiter = new Array();
+js_behaviours_limiter = array_limiter(js_behaviours_limiter);
+
+function array_altq(a_behav) {
+	var index;
+	<? if (!empty($avail_behaviours_altq)) {
+	  foreach ($avail_behaviours_altq as $key => $queue) { ?>
+	    name = "<?= $queue; ?>";
+	    index = <? echo $key; ?>;
+	    a_behav[index] = name;
+	<? }
+	} ?>
+	return a_behav;
+}
+
+function array_limiter(a_behav) {
+	var index;
+	<? if (!empty($avail_behaviours_limiter)) {
+	  foreach ($avail_behaviours_limiter as $key => $limiter) { ?>
+		name = "<?= $limiter; ?>";
+		index = <? echo $key; ?>;
+		a_behav[index] = name;
+	<? }
+	} ?>
+	return a_behav;
+}
+
+/* Fill the variables with available protocols, structures and behaviours */
+function fillProtocol() {
+	var protocol = '<select name="protocol[]" id="protocol" style="font-size:8pt">';
+	var name;
+
+	<? foreach ($avail_protos as $key => $proto) { ?>
+		name = "<?= $proto; ?>";
+		protocol += "<option value=" + name + ">" + name + "</option>";
+	<? } ?>
+	protocol += "</select>";
+	
+	return protocol;
+}
+
+function fillStructure() {
+	var structure = '<select name="structure[]" id="structure" style="font-size:8pt" onchange="changeBehaviourValues(this.parentNode.parentNode);">';
+	var name;
+	<? foreach ($avail_structures as $key => $struct) { ?>
+		name = "<?= $struct; ?>";
+		if(name == "queue") {
+		  if(js_behaviours_altq != "") { structure += "<option value=" + name + ">" + name + "</option>";}
+		}
+		else {
+		  if(name == "limiter") {
+		    if(js_behaviours_limiter != "") { structure += "<option value=" + name + ">" + name + "</option>";}
+		  }
+		  else structure += "<option value=" + name + ">" + name + "</option>"; //action		  		
+		}		
+	<? } ?>
+	structure += "</select>";
+	
+	return structure;
+}
+		
+//Used by default to fill the values when inserting a new row.
+function fillBehaviour() {
+	var behaviour = '<select name="behaviour[]" id="behaviour" style="width:80px; font-size:8pt">';
+	var name;
+	<? foreach ($avail_behaviours_action as $key => $behav) { ?>
+		name = "<?= $behav; ?>";
+		behaviour += "<option value=" + name + ">" + name + "</option>";
+	<? } ?>
+	behaviour += "</select>";
+	
+	return behaviour;
+}
+
+/* Change the values on behaviours select when changing the structure row */
+function changeBehaviourValues(row) {
+	var selectedRow = row.rowIndex - 2; //because row.rowIndex returns 2, not 0
+	var structureSelected = document.getElementsByName("structure[]")[selectedRow].value;		
+	
+	//Select the behaviours values to array a_behav
+	var a_behav = new Array();	
+	if (structureSelected == "action") {
+		a_behav = js_behaviours_action; //static
+	}
+	else {
+		if (structureSelected == "queue") {			
+			a_behav = js_behaviours_altq;
+		}
+		else {							
+			a_behav = js_behaviours_limiter;
+		}					
+	}			
+	
+	//Build the html statement with the array values previously selected
+	var new_behav;
+	var name;
+	for(i=0; i<a_behav.length; i++) {
+		new_behav += "<option value=" + a_behav[i] + ">" + a_behav[i] + "</option>";	
+	}
+		
+	document.getElementsByName("behaviour[]")[selectedRow].innerHTML = new_behav;		
+}
+
+/* Add row to the table */
+function addRow(table_id) {
+  var tbl = document.getElementById(table_id);
+  // counting rows in table
+  var rows_count = tbl.rows.length;
+  if (initial_count[table_id] == undefined) {
+    // if it is first adding in this table setting initial rows count
+    initial_count[table_id] = rows_count;
+  }
+  // determining real count of added fields
+  var tFielsNum =  rows_count - initial_count[table_id];
+  if (rows_limit!=0 && tFielsNum >= rows_limit) return false;
+  
+  var remove = '<input type = "image" src = "/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(\''+table_id+'\',this.parentNode.parentNode)" value = "Delete" />';
+  
+  try {
+    var newRow = tbl.insertRow(rows_count);
+    var newCell = newRow.insertCell(0);
+    newCell.innerHTML = fillProtocol();
+    var newCell = newRow.insertCell(1);
+    newCell.innerHTML = fillStructure();
+    var newCell = newRow.insertCell(2);
+    newCell.innerHTML = fillBehaviour();
+    var newCell = newRow.insertCell(3);
+    newCell.innerHTML = remove;
+  }   
+  catch (ex) {
+    //if exception occurs
+    alert(ex);
+  }   
+}
+
+/* Remove row from the table */
+function removeRow(tbl,row) {
+  var table = document.getElementById(tbl);
+  try {
+    table.deleteRow(row.rowIndex);
+  } catch (ex) {
+    alert(ex);
+  }
+}
+</script>
+
+<?php
+include("fbegin.inc"); 
+?>
+<div id="inputerrors"></div>
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+
+<form action="firewall_shaper_layer7.php" method="post" id="iform" name="iform">
+
+<?php if ($savemsg) print_info_box($savemsg); ?>
+<?php if (file_exists($d_shaperconfdirty_path)): ?><p>
+<?php print_info_box_np("The traffic shaper configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
+<?php endif; ?>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td>
+<?php
+	$tab_array = array();
+	$tab_array[0] = array("By Interface", false, "firewall_shaper.php");
+	$tab_array[1] = array("By Queue", false, "firewall_shaper_queues.php");
+	$tab_array[2] = array("Limiter", false, "firewall_shaper_vinterface.php");
+	$tab_array[3] = array("Layer7", true, "firewall_shaper_layer7.php");
+	$tab_array[4] = array("Wizards", false, "firewall_shaper_wizards.php");
+	display_top_tabs($tab_array);
+?>
+  </td></tr>
+  <tr>
+    <td>
+	<div id="mainarea">
+              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+		
+		<?php if (count($layer7_rules_list) > 0): ?>
+                        <tr class="tabcont"><td width="25%" align="left">
+                        </td><td width="75%"> </td></tr>
+		
+		<? endif; ?>
+			<tr>
+			<td width="25%" valign="top" algin="left">
+			<?php
+				echo $tree; 
+			?>
+			<br/><br/>
+			<a href="firewall_shaper_layer7.php?action=add">
+			<img src="./themes/<?=$g['theme']; ?>/images/icons/icon_plus.gif" title="Create new l7 rules group" width="17" height="17" border="0">  Create new l7 rules group
+			</a><br/>
+			</td>
+			<td width="75%" valign="top" align="center">
+			<table>
+			<?
+				echo $output;
+			?>
+			
+			<!-- Layer 7 rules form -->
+			<?php if($show_proto_form): ?>
+			<td width = "22%" valign = "top" class = "vncellreq">
+                                <div id = "addressnetworkport">
+                                        Rule(s)
+                                </div>
+                        </td>
+
+                        <td width = "78%" class = "vtable">
+                                <table width="236" id = "maintable">
+					<tbody>
+                                                    
+						<tr>
+                                                        <td colspan = "4">
+                                                            <div style = "font-size: 8pt; padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066;"
+                                                                id = "itemhelp">
+                                                                Add one or more rules
+                                                            </div>
+                                                        </td>
+                                                </tr>
+
+                                                <tr>
+                                                        <td>
+                                                            <div style = "font-size: 8pt; padding:5px;"
+                                                                id = "onecolumn">
+                                                                Protocol
+                                                            </div>
+                                                        </td>
+
+                                                        <td>
+                                                            <div style = "font-size: 8pt; padding:5px;"
+                                                                id = "twocolumn">
+                                                                Structure
+                                                            </div>
+                                                        </td>
+
+                                                        <td>
+                                                            <div style = "font-size: 8pt; padding:5px;"
+                                                                id = "threecolumn">
+                                                                Behaviour
+                                                            </div>
+                                                        </td>
+                                                </tr>                                                                                                        
+                                                <!-- PHP Code to generate the existing rules -->
+						<?php
+						if($container) {
+							foreach($container->rsets as $l7rule) {
+						?>
+						<tr>
+							<td>
+							<select name="protocol[]" class="formselect" id="protocol" style="font-size:8pt">
+							<?php foreach($avail_protos as $proto): ?>
+							<option value="<?=$proto;?>" <?php if ($proto == $l7rule->GetRProtocol()) echo "selected"; ?>><?=$proto;?></option>
+							<? endforeach; ?>
+							</select>
+						</td>
+						<td>
+							<select name="structure[]" class="formselect" id="structure" style="font-size:8pt" onchange="changeBehaviourValues(this.parentNode.parentNode);">
+							<?php foreach($avail_structures as $struct) {
+							  if($struct == "queue") {
+							    if(!empty($avail_behaviours_altq)) { ?>
+							      <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected"; ?>><?=$struct;?></option>
+							    <?php }
+							  }
+							  else {
+							    if($struct == "limiter") {
+								if(!empty($avail_behaviours_limiter)) { ?>
+								  <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected"; ?>><?=$struct;?></option>
+								<?php }
+							    }
+							    else {
+							      if($struct == "action") { ?>
+								  <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected"; ?>><?=$struct;?></option>
+							      <?php }							      							      
+							    }
+							  }
+							} ?>
+							</select>
+						</td>
+						<td>
+							<select name="behaviour[]" class="formselect" id="behaviour" style="width:80px; font-size:8pt">
+							<?php if($l7rule->GetRStructure() == "action"): ?>
+								<?php foreach($avail_behaviours_action as $behaviour): ?>
+								<option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected"; ?>><?=$behaviour;?></option>
+								<? endforeach; ?>
+								</select>
+							<? endif; ?>
+							<?php if($l7rule->GetRStructure() == "queue"): ?>
+								<?php foreach($avail_behaviours_altq as $behaviour): ?>
+								<option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected"; ?>><?=$behaviour;?></option>
+								<? endforeach; ?>
+								</select>
+							<? endif; ?>
+							<?php if($l7rule->GetRStructure() == "limiter"): ?>
+								<?php foreach($avail_behaviours_limiter as $behaviour): ?>
+								<option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected"; ?>><?=$behaviour;?></option>
+								<? endforeach; ?>
+								</select>
+							<? endif; ?>							
+						</td>
+						<td>
+							<input type="image" src="/themes/<? echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow('maintable',this.parentNode.parentNode); return false;" value="Delete" />
+						</td>
+						</tr>
+						
+						<?php
+							} //end foreach
+						} //end if
+						?>  
+                                        </tbody>
+
+                                        <tfoot>
+                                        </tfoot>
+                                </table>
+
+                                        <a onclick = "javascript:addRow('maintable'); return false;" href="#"> <img border = "0"
+                                                src = "/themes/<?=$g['theme']; ?>/images/icons/icon_plus.gif"
+                                                alt = "" title = "add another entry" /> </a>
+                        </td>
+			</tr>
+
+                        <tr>
+                        <td width = "22%" valign = "top">
+                                &nbsp;
+                        </td>
+
+                        <td width = "78%">
+                                <input id = "submit"
+                                name = "submit" type = "submit" class = "formbtn" value = "Save" />
+
+				<a href= "firewall_shaper_layer7.php">
+                                <input id = "cancelbutton"
+                                name = "cancelbutton" type = "button" class = "formbtn" value = "Cancel" /></a>
+				
+				<?php if($container): ?>
+						<input id = "delete" type="submit" class="formbtn" name="delete" value="Delete"></a>
+				<? endif ?>
+                        </td>
+                        </tr>
+			<? endif; ?>
+			<!-- End of layer7 rules form -->
+			</table>
+
+		      </td></tr>
+                    </table>
+		</div>
+	  </td>
+	</tr>
+</table>
+</form>
+
+<?php include("fend.inc"); 
+?>
+</body>
+</html>
+\ No newline at end of file
diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php
index 061314b..342083e 100755
--- a/usr/local/www/firewall_shaper_queues.php
+++ b/usr/local/www/firewall_shaper_queues.php
@@ -188,7 +188,8 @@ include("head.inc");
 	$tab_array[0] = array("By Interface", false, "firewall_shaper.php");
 	$tab_array[1] = array("By Queue", true, "firewall_shaper_queues.php");
 	$tab_array[2] = array("Limiter", false, "firewall_shaper_vinterface.php");
-	$tab_array[3] = array("Wizards", false, "firewall_shaper_wizards.php");
+	$tab_array[3] = array("Layer7", false, "firewall_shaper_layer7.php");
+	$tab_array[4] = array("Wizards", false, "firewall_shaper_wizards.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index b1bf9a5..75b7e6c 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -367,7 +367,8 @@ include("fbegin.inc");
 	$tab_array[0] = array("By Interface", false, "firewall_shaper.php");
 	$tab_array[1] = array("By Queue", false, "firewall_shaper_queues.php");
 	$tab_array[2] = array("Limiter", true, "firewall_shaper_vinterface.php");
-	$tab_array[3] = array("Wizards", false, "firewall_shaper_wizards.php");
+	$tab_array[3] = array("Layer7", false, "firewall_shaper_layer7.php");
+	$tab_array[4] = array("Wizards", false, "firewall_shaper_wizards.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/firewall_shaper_wizards.php b/usr/local/www/firewall_shaper_wizards.php
index a086cc1..2290a3f 100755
--- a/usr/local/www/firewall_shaper_wizards.php
+++ b/usr/local/www/firewall_shaper_wizards.php
@@ -97,7 +97,8 @@ include("fbegin.inc");
 	$tab_array[0] = array("By Interface", false, "firewall_shaper.php");
 	$tab_array[1] = array("By Queue", false, "firewall_shaper_queues.php");
 	$tab_array[2] = array("Limiter", false, "firewall_shaper_vinterface.php");
-	$tab_array[3] = array("Wizards", true, "firewall_shaper_wizards.php");
+	$tab_array[3] = array("Layer7", false, "firewall_shaper_layer7.php");
+	$tab_array[4] = array("Wizards", true, "firewall_shaper_wizards.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
author	Helder Pereira <helder.lesi@gmail.com>	2008-12-20 23:57:09 +0000
committer	Helder Pereira <helder.lesi@gmail.com>	2008-12-20 23:57:09 +0000
commit	f63d5b66b49abe5190703d9d251b7e2d462e993b (patch)
tree	1f58463ec12462516df5cd20fe724bf22862536b /usr
parent	adc986ed5e5bb1de0e478dc1e3abf4f493ca1c3f (diff)
download	pfsense-f63d5b66b49abe5190703d9d251b7e2d462e993b.zip pfsense-f63d5b66b49abe5190703d9d251b7e2d462e993b.tar.gz