Add lowthroughtput items to magic shaper

1 files changed, 132 insertions, 130 deletions

diff --git a/usr/local/www/firewall_shaper_edit.php b/usr/local/www/firewall_shaper_edit.php
index 5b0e249..43d1974 100755
--- a/usr/local/www/firewall_shaper_edit.php
+++ b/usr/local/www/firewall_shaper_edit.php
@@ -1,22 +1,22 @@
 #!/usr/local/bin/php
-<?php 
+<?php
 /*
 	firewall_shaper_edit.php
 	part of m0n0wall (http://m0n0.ch/wall)
-	
+
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	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
@@ -41,27 +41,27 @@ $specialsrcdst = explode(" ", "any lan pptp");
 $id = $_GET['id'];
 if (isset($_POST['id']))
 	$id = $_POST['id'];
-	
+
 $after = $_GET['after'];
 if (isset($_POST['after']))
 	$after = $_POST['after'];
-	
+
 if (isset($_GET['dup'])) {
 	$id = $_GET['dup'];
 	$after = $_GET['dup'];
 }
-	
+
 function is_specialnet($net) {
 	global $specialsrcdst;
-	
+
 	if (in_array($net, $specialsrcdst) || strstr($net, "opt"))
 		return true;
 	else
 		return false;
 }
-	
+
 function address_to_pconfig($adr, &$padr, &$pmask, &$pnot, &$pbeginport, &$pendport) {
-		
+
 	if (isset($adr['any']))
 		$padr = "any";
 	else if ($adr['network'])
@@ -71,12 +71,12 @@ function address_to_pconfig($adr, &$padr, &$pmask, &$pnot, &$pbeginport, &$pendp
 		if (!$pmask)
 			$pmask = 32;
 	}
-	
+
 	if (isset($adr['not']))
 		$pnot = 1;
 	else
 		$pnot = 0;
-	
+
 	if ($adr['port']) {
 		list($pbeginport, $pendport) = explode("-", $adr['port']);
 		if (!$pendport)
@@ -88,9 +88,9 @@ function address_to_pconfig($adr, &$padr, &$pmask, &$pnot, &$pbeginport, &$pendp
 }
 
 function pconfig_to_address(&$adr, $padr, $pmask, $pnot, $pbeginport, $pendport) {
-	
+
 	$adr = array();
-	
+
 	if ($padr == "any")
 		$adr['any'] = true;
 	else if (is_specialnet($padr))
@@ -100,9 +100,9 @@ function pconfig_to_address(&$adr, $padr, $pmask, $pnot, $pbeginport, $pendport)
 		if ($pmask != 32)
 			$adr['address'] .= "/" . $pmask;
 	}
-	
+
 	$adr['not'] = $pnot ? true : false;
-	
+
 	if (($pbeginport != 0) && ($pbeginport != "any")) {
 		if ($pbeginport != $pendport)
 			$adr['port'] = $pbeginport . "-" . $pendport;
@@ -113,33 +113,33 @@ function pconfig_to_address(&$adr, $padr, $pmask, $pnot, $pbeginport, $pendport)
 
 if (isset($id) && $a_shaper[$id]) {
 	$pconfig['interface'] = $a_shaper[$id]['interface'];
-	
+
 	if (isset($a_shaper[$id]['protocol']))
 		$pconfig['proto'] = $a_shaper[$id]['protocol'];
 	else
 		$pconfig['proto'] = "any";
-	
+
 	address_to_pconfig($a_shaper[$id]['source'], $pconfig['src'],
 		$pconfig['srcmask'], $pconfig['srcnot'],
 		$pconfig['srcbeginport'], $pconfig['srcendport']);
-		
+
 	address_to_pconfig($a_shaper[$id]['destination'], $pconfig['dst'],
 		$pconfig['dstmask'], $pconfig['dstnot'],
 		$pconfig['dstbeginport'], $pconfig['dstendport']);
-	
+
 	if (isset($a_shaper[$id]['targetpipe'])) {
 		$pconfig['target'] = "targetpipe:" . $a_shaper[$id]['targetpipe'];
 	} else if (isset($a_shaper[$id]['targetqueue'])) {
 		$pconfig['target'] = "targetqueue:" . $a_shaper[$id]['targetqueue'];
 	}
-	
+
 	$pconfig['direction'] = $a_shaper[$id]['direction'];
 	$pconfig['iptos'] = $a_shaper[$id]['iptos'];
 	$pconfig['iplen'] = $a_shaper[$id]['iplen'];
 	$pconfig['tcpflags'] = $a_shaper[$id]['tcpflags'];
 	$pconfig['descr'] = $a_shaper[$id]['descr'];
 	$pconfig['disabled'] = isset($a_shaper[$id]['disabled']);
-	
+
 	if ($pconfig['srcbeginport'] == 0) {
 		$pconfig['srcbeginport'] = "any";
 		$pconfig['srcendport'] = "any";
@@ -148,7 +148,7 @@ if (isset($id) && $a_shaper[$id]) {
 		$pconfig['dstbeginport'] = "any";
 		$pconfig['dstendport'] = "any";
 	}
-	
+
 } else {
 	/* defaults */
 	$pconfig['src'] = "any";
@@ -166,38 +166,38 @@ if ($_POST) {
 		$_POST['dstbeginport'] = 0;
 		$_POST['dstendport'] = 0;
 	} else {
-	
+
 		if ($_POST['srcbeginport_cust'] && !$_POST['srcbeginport'])
 			$_POST['srcbeginport'] = $_POST['srcbeginport_cust'];
 		if ($_POST['srcendport_cust'] && !$_POST['srcendport'])
 			$_POST['srcendport'] = $_POST['srcendport_cust'];
-	
+
 		if ($_POST['srcbeginport'] == "any") {
 			$_POST['srcbeginport'] = 0;
 			$_POST['srcendport'] = 0;
-		} else {			
+		} else {
 			if (!$_POST['srcendport'])
 				$_POST['srcendport'] = $_POST['srcbeginport'];
 		}
 		if ($_POST['srcendport'] == "any")
 			$_POST['srcendport'] = $_POST['srcbeginport'];
-		
+
 		if ($_POST['dstbeginport_cust'] && !$_POST['dstbeginport'])
 			$_POST['dstbeginport'] = $_POST['dstbeginport_cust'];
 		if ($_POST['dstendport_cust'] && !$_POST['dstendport'])
 			$_POST['dstendport'] = $_POST['dstendport_cust'];
-		
+
 		if ($_POST['dstbeginport'] == "any") {
 			$_POST['dstbeginport'] = 0;
 			$_POST['dstendport'] = 0;
-		} else {			
+		} else {
 			if (!$_POST['dstendport'])
 				$_POST['dstendport'] = $_POST['dstbeginport'];
 		}
 		if ($_POST['dstendport'] == "any")
-			$_POST['dstendport'] = $_POST['dstbeginport'];		
+			$_POST['dstendport'] = $_POST['dstbeginport'];
 	}
-		
+
 	if (is_specialnet($_POST['srctype'])) {
 		$_POST['src'] = $_POST['srctype'];
 		$_POST['srcmask'] = 0;
@@ -210,7 +210,7 @@ if ($_POST) {
 	}  else if ($_POST['dsttype'] == "single") {
 		$_POST['dstmask'] = 32;
 	}
-	
+
 	$intos = array();
 	foreach ($iptos as $tos) {
 		if ($_POST['iptos_' . $tos] == "on")
@@ -219,7 +219,7 @@ if ($_POST) {
 			$intos[] = "!" . $tos;
 	}
 	$_POST['iptos'] = join(",", $intos);
-	
+
 	$intcpflags = array();
 	foreach ($tcpflags as $tcpflag) {
 		if ($_POST['tcpflags_' . $tcpflag] == "on")
@@ -228,14 +228,14 @@ if ($_POST) {
 			$intcpflags[] = "!" . $tcpflag;
 	}
 	$_POST['tcpflags'] = join(",", $intcpflags);
-	
+
 	unset($input_errors);
 	$pconfig = $_POST;
 
 	/* input validation */
 	$reqdfields = explode(" ", "target proto src dst");
 	$reqdfieldsn = explode(",", "Target,Protocol,Source,Destination");
-	
+
 	if (!(is_specialnet($_POST['srctype']) || ($_POST['srctype'] == "single"))) {
 		$reqdfields[] = "srcmask";
 		$reqdfieldsn[] = "Source bit count";
@@ -244,9 +244,9 @@ if ($_POST) {
 		$reqdfields[] = "dstmask";
 		$reqdfieldsn[] = "Destination bit count";
 	}
-	
+
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-	
+
 	if (!$_POST['srcbeginport']) {
 		$_POST['srcbeginport'] = 0;
 		$_POST['srcendport'] = 0;
@@ -255,7 +255,7 @@ if ($_POST) {
 		$_POST['dstbeginport'] = 0;
 		$_POST['dstendport'] = 0;
 	}
-	
+
 	if (($_POST['srcbeginport'] && !is_port($_POST['srcbeginport']))) {
 		$input_errors[] = "The start source port must be an integer between 1 and 65535.";
 	}
@@ -268,7 +268,7 @@ if ($_POST) {
 	if (($_POST['dstendport'] && !is_port($_POST['dstendport']))) {
 		$input_errors[] = "The end destination port must be an integer between 1 and 65535.";
 	}
-	
+
 	if (!is_specialnet($_POST['srctype'])) {
 		if (($_POST['src'] && !is_ipaddroranyalias($_POST['src']))) {
 			$input_errors[] = "A valid source IP address or alias must be specified.";
@@ -285,7 +285,7 @@ if ($_POST) {
 			$input_errors[] = "A valid destination bit count must be specified.";
 		}
 	}
-	
+
 	if ($_POST['srcbeginport'] > $_POST['srcendport']) {
 		/* swap */
 		$tmp = $_POST['srcendport'];
@@ -298,7 +298,7 @@ if ($_POST) {
 		$_POST['dstendport'] = $_POST['dstbeginport'];
 		$_POST['dstbeginport'] = $tmp;
 	}
-	
+
 	if (($_POST['iplen'] && !preg_match("/^(\d+)(-(\d+))?$/", $_POST['iplen']))) {
 		$input_errors[] = "The IP packet length must be an integer or a range (from-to).";
 	}
@@ -306,30 +306,30 @@ if ($_POST) {
 	if (!$input_errors) {
 		$shaperent = array();
 		$shaperent['interface'] = $_POST['interface'];
-		
+
 		if ($_POST['proto'] != "any")
 			$shaperent['protocol'] = $_POST['proto'];
 		else
 			unset($shaperent['protocol']);
-		
+
 		pconfig_to_address($shaperent['source'], $_POST['src'],
 			$_POST['srcmask'], $_POST['srcnot'],
 			$_POST['srcbeginport'], $_POST['srcendport']);
-			
+
 		pconfig_to_address($shaperent['destination'], $_POST['dst'],
 			$_POST['dstmask'], $_POST['dstnot'],
 			$_POST['dstbeginport'], $_POST['dstendport']);
-		
+
 		$shaperent['direction'] = $_POST['direction'];
 		$shaperent['iplen'] = $_POST['iplen'];
 		$shaperent['iptos'] = $_POST['iptos'];
 		$shaperent['tcpflags'] = $_POST['tcpflags'];
 		$shaperent['descr'] = $_POST['descr'];
 		$shaperent['disabled'] = $_POST['disabled'] ? true : false;
-		
+
 		list($targettype,$target) = explode(":", $_POST['target']);
 		$shaperent[$targettype] = $target;
-		
+
 		if (isset($id) && $a_shaper[$id])
 			$a_shaper[$id] = $shaperent;
 		else {
@@ -338,10 +338,10 @@ if ($_POST) {
 			else
 				$a_shaper[] = $shaperent;
 		}
-		
+
 		write_config();
 		touch($d_shaperconfdirty_path);
-		
+
 		header("Location: firewall_shaper.php");
 		exit;
 	}
@@ -382,7 +382,7 @@ function ext_change() {
 		document.iform.dstendport_cust.value = "";
 		document.iform.dstendport_cust.disabled = 1;
 	}
-	
+
 	if (!portsenabled) {
 		document.iform.srcbeginport.disabled = 1;
 		document.iform.srcendport.disabled = 1;
@@ -439,7 +439,7 @@ function proto_change() {
 	} else {
 		portsenabled = 0;
 	}
-	
+
 	ext_change();
 }
 
@@ -457,15 +457,15 @@ function dst_rep_change() {
 <?php include("fbegin.inc"); ?>
 <p class="pgtitle">Firewall: Traffic shaper: Edit rule</p>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if (is_array($config['shaper']['pipe']) && (count($config['shaper']['pipe']) > 0)): ?>
+<?php if (is_array($config['shaper']['queue']) && (count($config['shaper']['queue']) > 0)): ?>
             <form action="firewall_shaper_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
-                <tr> 
+                <tr>
                   <td valign="top" class="vncellreq">Target</td>
                   <td class="vtable"> <select name="target" class="formfld">
-                      <?php 
+                      <?php
 					  foreach ($config['shaper']['pipe'] as $pipei => $pipe): ?>
-                      <option value="<?="targetpipe:$pipei";?>" <?php if ("targetpipe:$pipei" == $pconfig['target']) echo "selected"; ?>> 
+                      <option value="<?="targetpipe:$pipei";?>" <?php if ("targetpipe:$pipei" == $pconfig['target']) echo "selected"; ?>>
                       <?php
 					  	echo htmlspecialchars("Pipe " . ($pipei + 1));
 						if ($pipe['descr'])
@@ -474,16 +474,16 @@ function dst_rep_change() {
                       </option>
                       <?php endforeach;
 					  foreach ($config['shaper']['queue'] as $queuei => $queue): ?>
-                      <option value="<?="targetqueue:$queuei";?>" <?php if ("targetqueue:$queuei" == $pconfig['target']) echo "selected"; ?>> 
+                      <option value="<?="targetqueue:$queuei";?>" <?php if ("targetqueue:$queuei" == $pconfig['target']) echo "selected"; ?>>
                       <?php
 					  	echo htmlspecialchars("Queue " . ($queuei + 1));
-						if ($queue['descr'])
-							echo htmlspecialchars(" (" . $queue['descr'] . ")");
+						if ($queue['name'])
+							echo htmlspecialchars(" (" . $queue['name'] . ")");
 					  ?>
                       </option>
                       <?php endforeach; ?>
                     </select> <br>
-                    <span class="vexpl">Choose a pipe or queue where packets that 
+                    <span class="vexpl">Choose a pipe or queue where packets that
                     match this rule should be sent.</span></td>
                 </tr>
                 <tr>
@@ -493,7 +493,7 @@ function dst_rep_change() {
                     <strong>Disable this rule</strong><br>
                     <span class="vexpl">Set this option to disable this rule without removing it from the list.</span></td>
                 </tr>
-                <tr> 
+                <tr>
                   <td width="22%" valign="top" class="vncellreq">Interface</td>
                   <td width="78%" class="vtable"> <select name="interface" class="formfld">
                       <?php $interfaces = array('lan' => 'LAN', 'wan' => 'WAN', 'pptp' => 'PPTP');
@@ -501,60 +501,60 @@ function dst_rep_change() {
 					  	$interfaces['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
 					  }
 					  foreach ($interfaces as $iface => $ifacename): ?>
-                      <option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>> 
+                      <option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>>
                       <?=htmlspecialchars($ifacename);?>
                       </option>
                       <?php endforeach; ?>
                     </select> <br>
-                    <span class="vexpl">Choose which interface packets must pass 
+                    <span class="vexpl">Choose which interface packets must pass
                     through to match this rule.</span></td>
                 </tr>
-                <tr> 
+                <tr>
                   <td width="22%" valign="top" class="vncellreq">Protocol</td>
                   <td width="78%" class="vtable"> <select name="proto" class="formfld" onchange="proto_change()">
                       <?php $protocols = explode(" ", "TCP UDP ICMP ESP AH GRE IPv6 IGMP any"); foreach ($protocols as $proto): ?>
-                      <option value="<?=strtolower($proto);?>" <?php if (strtolower($proto) == $pconfig['proto']) echo "selected"; ?>> 
+                      <option value="<?=strtolower($proto);?>" <?php if (strtolower($proto) == $pconfig['proto']) echo "selected"; ?>>
                       <?=htmlspecialchars($proto);?>
                       </option>
                       <?php endforeach; ?>
-                    </select> <br> <span class="vexpl">Choose which IP protocol 
+                    </select> <br> <span class="vexpl">Choose which IP protocol
                     this rule should match.<br>
                     Hint: in most cases, you should specify <em>TCP</em> &nbsp;here.</span></td>
                 </tr>
-                <tr> 
+                <tr>
                   <td width="22%" valign="top" class="vncellreq">Source</td>
-                  <td width="78%" class="vtable"> <input name="srcnot" type="checkbox" id="srcnot" value="yes" <?php if ($pconfig['srcnot']) echo "checked"; ?>> 
+                  <td width="78%" class="vtable"> <input name="srcnot" type="checkbox" id="srcnot" value="yes" <?php if ($pconfig['srcnot']) echo "checked"; ?>>
                     <strong>not</strong><br>
-                    Use this option to invert the sense of the match.<br> <br> 
+                    Use this option to invert the sense of the match.<br> <br>
                     <table border="0" cellspacing="0" cellpadding="0">
-                      <tr> 
+                      <tr>
                         <td>Type:&nbsp;&nbsp;</td>
                         <td><select name="srctype" class="formfld" onChange="typesel_change()">
                             <?php $sel = is_specialnet($pconfig['src']); ?>
-                            <option value="any" <?php if ($pconfig['src'] == "any") { echo "selected"; } ?>> 
+                            <option value="any" <?php if ($pconfig['src'] == "any") { echo "selected"; } ?>>
                             any</option>
-                            <option value="single" <?php if (($pconfig['srcmask'] == 32) && !$sel) { echo "selected"; $sel = 1; } ?>> 
+                            <option value="single" <?php if (($pconfig['srcmask'] == 32) && !$sel) { echo "selected"; $sel = 1; } ?>>
                             Single host or alias</option>
-                            <option value="network" <?php if (!$sel) echo "selected"; ?>> 
+                            <option value="network" <?php if (!$sel) echo "selected"; ?>>
                             Network</option>
-                            <option value="lan" <?php if ($pconfig['src'] == "lan") { echo "selected"; } ?>> 
+                            <option value="lan" <?php if ($pconfig['src'] == "lan") { echo "selected"; } ?>>
                             LAN subnet</option>
-                            <option value="pptp" <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>> 
+                            <option value="pptp" <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>>
                             PPTP clients</option>
                             <?php for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++): ?>
-                            <option value="opt<?=$i;?>" <?php if ($pconfig['src'] == "opt" . $i) { echo "selected"; } ?>> 
+                            <option value="opt<?=$i;?>" <?php if ($pconfig['src'] == "opt" . $i) { echo "selected"; } ?>>
                             <?=htmlspecialchars($config['interfaces']['opt' . $i]['descr']);?>
                             subnet</option>
                             <?php endfor; ?>
                           </select></td>
                       </tr>
-                      <tr> 
+                      <tr>
                         <td>Address:&nbsp;&nbsp;</td>
                         <td><input name="src" type="text" class="formfldalias" id="src" size="20" value="<?php if (!is_specialnet($pconfig['src'])) echo htmlspecialchars($pconfig['src']);?>">
-                          / 
+                          /
                           <select name="srcmask" class="formfld" id="srcmask">
                             <?php for ($i = 31; $i > 0; $i--): ?>
-                            <option value="<?=$i;?>" <?php if ($i == $pconfig['srcmask']) echo "selected"; ?>> 
+                            <option value="<?=$i;?>" <?php if ($i == $pconfig['srcmask']) echo "selected"; ?>>
                             <?=$i;?>
                             </option>
                             <?php endfor; ?>
@@ -562,11 +562,11 @@ function dst_rep_change() {
                       </tr>
                     </table></td>
                 </tr>
-                <tr> 
-                  <td width="22%" valign="top" class="vncellreq">Source port range 
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Source port range
                   </td>
                   <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="0">
-                      <tr> 
+                      <tr>
                         <td>from:&nbsp;&nbsp;</td>
                         <td><select name="srcbeginport" class="formfld" onchange="src_rep_change();ext_change()">
                             <option value="">(other)</option>
@@ -575,13 +575,13 @@ function dst_rep_change() {
                             <option value="<?=$wkport;?>" <?php if ($wkport == $pconfig['srcbeginport']) {
 																echo "selected";
 																$bfound = 1;
-															}?>> 
+															}?>>
                             <?=htmlspecialchars($wkportdesc);?>
                             </option>
                             <?php endforeach; ?>
                           </select> <input name="srcbeginport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['srcbeginport']) echo $pconfig['srcbeginport']; ?>"></td>
                       </tr>
-                      <tr> 
+                      <tr>
                         <td>to:</td>
                         <td><select name="srcendport" class="formfld" onchange="ext_change()">
                             <option value="">(other)</option>
@@ -590,51 +590,51 @@ function dst_rep_change() {
                             <option value="<?=$wkport;?>" <?php if ($wkport == $pconfig['srcendport']) {
 																echo "selected";
 																$bfound = 1;
-															}?>> 
+															}?>>
                             <?=htmlspecialchars($wkportdesc);?>
                             </option>
                             <?php endforeach; ?>
                           </select> <input name="srcendport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['srcendport']) echo $pconfig['srcendport']; ?>"></td>
                       </tr>
                     </table>
-                    <br> <span class="vexpl">Specify the port or port range for 
+                    <br> <span class="vexpl">Specify the port or port range for
                     the source of the packet for this rule.<br>
-                    Hint: you can leave the <em>'to'</em> field empty if you only 
+                    Hint: you can leave the <em>'to'</em> field empty if you only
                     want to filter a single port</span></td>
-                <tr> 
+                <tr>
                   <td width="22%" valign="top" class="vncellreq">Destination</td>
-                  <td width="78%" class="vtable"> <input name="dstnot" type="checkbox" id="dstnot" value="yes" <?php if ($pconfig['dstnot']) echo "checked"; ?>> 
+                  <td width="78%" class="vtable"> <input name="dstnot" type="checkbox" id="dstnot" value="yes" <?php if ($pconfig['dstnot']) echo "checked"; ?>>
                     <strong>not</strong><br>
-                    Use this option to invert the sense of the match.<br> <br> 
+                    Use this option to invert the sense of the match.<br> <br>
                     <table border="0" cellspacing="0" cellpadding="0">
-                      <tr> 
+                      <tr>
                         <td>Type:&nbsp;&nbsp;</td>
                         <td><select name="dsttype" class="formfld" onChange="typesel_change()">
                             <?php $sel = is_specialnet($pconfig['dst']); ?>
-                            <option value="any" <?php if ($pconfig['dst'] == "any") { echo "selected"; } ?>> 
+                            <option value="any" <?php if ($pconfig['dst'] == "any") { echo "selected"; } ?>>
                             any</option>
-                            <option value="single" <?php if (($pconfig['dstmask'] == 32) && !$sel) { echo "selected"; $sel = 1; } ?>> 
+                            <option value="single" <?php if (($pconfig['dstmask'] == 32) && !$sel) { echo "selected"; $sel = 1; } ?>>
                             Single host or alias</option>
-                            <option value="network" <?php if (!$sel) echo "selected"; ?>> 
+                            <option value="network" <?php if (!$sel) echo "selected"; ?>>
                             Network</option>
-                            <option value="lan" <?php if ($pconfig['dst'] == "lan") { echo "selected"; } ?>> 
+                            <option value="lan" <?php if ($pconfig['dst'] == "lan") { echo "selected"; } ?>>
                             LAN subnet</option>
-                            <option value="pptp" <?php if ($pconfig['dst'] == "pptp") { echo "selected"; } ?>> 
+                            <option value="pptp" <?php if ($pconfig['dst'] == "pptp") { echo "selected"; } ?>>
                             PPTP clients</option>
                             <?php for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++): ?>
-                            <option value="opt<?=$i;?>" <?php if ($pconfig['dst'] == "opt" . $i) { echo "selected"; } ?>> 
+                            <option value="opt<?=$i;?>" <?php if ($pconfig['dst'] == "opt" . $i) { echo "selected"; } ?>>
                             <?=htmlspecialchars($config['interfaces']['opt' . $i]['descr']);?>
                             subnet</option>
                             <?php endfor; ?>
                           </select> </td>
                       </tr>
-                      <tr> 
+                      <tr>
                         <td>Address:&nbsp;&nbsp;</td>
                         <td><input name="dst" type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>">
-                          / 
+                          /
                           <select name="dstmask" class="formfld" id="dstmask">
                             <?php for ($i = 31; $i > 0; $i--): ?>
-                            <option value="<?=$i;?>" <?php if ($i == $pconfig['dstmask']) echo "selected"; ?>> 
+                            <option value="<?=$i;?>" <?php if ($i == $pconfig['dstmask']) echo "selected"; ?>>
                             <?=$i;?>
                             </option>
                             <?php endfor; ?>
@@ -642,11 +642,11 @@ function dst_rep_change() {
                       </tr>
                     </table></td>
                 </tr>
-                <tr> 
-                  <td width="22%" valign="top" class="vncellreq">Destination port 
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Destination port
                     range </td>
                   <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="0">
-                      <tr> 
+                      <tr>
                         <td>from:&nbsp;&nbsp;</td>
                         <td><select name="dstbeginport" class="formfld" onchange="dst_rep_change();ext_change()">
                             <option value="">(other)</option>
@@ -655,13 +655,13 @@ function dst_rep_change() {
                             <option value="<?=$wkport;?>" <?php if ($wkport == $pconfig['dstbeginport']) {
 																echo "selected";
 																$bfound = 1;
-															}?>> 
+															}?>>
                             <?=htmlspecialchars($wkportdesc);?>
                             </option>
                             <?php endforeach; ?>
                           </select> <input name="dstbeginport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['dstbeginport']) echo $pconfig['dstbeginport']; ?>"></td>
                       </tr>
-                      <tr> 
+                      <tr>
                         <td>to:</td>
                         <td><select name="dstendport" class="formfld" onchange="ext_change()">
                             <option value="">(other)</option>
@@ -670,36 +670,36 @@ function dst_rep_change() {
                             <option value="<?=$wkport;?>" <?php if ($wkport == $pconfig['dstendport']) {
 																echo "selected";
 																$bfound = 1;
-															}?>> 
+															}?>>
                             <?=htmlspecialchars($wkportdesc);?>
                             </option>
                             <?php endforeach; ?>
                           </select> <input name="dstendport_cust" type="text" size="5" value="<?php if (!$bfound && $pconfig['dstendport']) echo $pconfig['dstendport']; ?>"></td>
                       </tr>
                     </table>
-                    <br> <span class="vexpl">Specify the port or port range for 
+                    <br> <span class="vexpl">Specify the port or port range for
                     the destination of the packet for this rule.<br>
-                    Hint: you can leave the <em>'to'</em> field empty if you only 
+                    Hint: you can leave the <em>'to'</em> field empty if you only
                     want to filter a single port</span></td>
-                <tr> 
+                <tr>
                   <td valign="top" class="vncell">Direction</td>
                   <td class="vtable"> <select name="direction" class="formfld">
                       <option value="" <?php if (!$pconfig['direction']) echo "selected"; ?>>any</option>
                       <option value="in" <?php if ($pconfig['direction'] == "in") echo "selected"; ?>>in</option>
                       <option value="out" <?php if ($pconfig['direction'] == "out") echo "selected"; ?>>out</option>
                     </select> <br>
-                    Use this to match only packets travelling in a given direction 
-                    on the interface specified above (as seen from the firewall's 
+                    Use this to match only packets travelling in a given direction
+                    on the interface specified above (as seen from the firewall's
                     perspective). </td>
                 </tr>
-				<tr> 
+				<tr>
                   <td width="22%" valign="top" class="vncell">IP Type of Service (TOS)</td>
                   <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="0">
-                      <?php 
+                      <?php
 				  $iniptos = explode(",", $pconfig['iptos']);
 				  foreach ($iptos as $tos): $dontcare = true; ?>
-                      <tr> 
-                        <td width="80" nowrap><strong> 
+                      <tr>
+                        <td width="80" nowrap><strong>
 			  <?echo $tos;?>
                           </strong></td>
                         <td nowrap> <input type="radio" name="iptos_<?=$tos;?>" value="on" <?php if (array_search($tos, $iniptos) !== false) { echo "checked"; $dontcare = false; }?>>
@@ -714,22 +714,24 @@ function dst_rep_change() {
                     <span class="vexpl">Use this to match packets according to their IP TOS values.
                     </span></td>
                 </tr>
-                <tr> 
+		<!--
+                <tr>
                   <td width="22%" valign="top" class="vncell">IP packet length</td>
-                  <td width="78%" class="vtable"><input name="iplen" type="text" id="iplen" size="10" value="<?=htmlspecialchars($pconfig['iplen']);?>"> 
+                  <td width="78%" class="vtable"><input name="iplen" type="text" id="iplen" size="10" value="<?=htmlspecialchars($pconfig['iplen']);?>">
                     <br>
-                    Setting this makes the rule match packets of a given length 
-                    (either a single value or a range in the syntax <em>from-to</em>, 
+                    Setting this makes the rule match packets of a given length
+                    (either a single value or a range in the syntax <em>from-to</em>,
                     e.g. 0-80). </td>
                 </tr>
-                <tr> 
+		-->
+                <tr>
                   <td width="22%" valign="top" class="vncell">TCP flags</td>
                   <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="0">
-                      <?php 
+                      <?php
 				  $inflags = explode(",", $pconfig['tcpflags']);
 				  foreach ($tcpflags as $tcpflag): $dontcare = true; ?>
-                      <tr> 
-                        <td width="40" nowrap><strong> 
+                      <tr>
+                        <td width="40" nowrap><strong>
                           <?=strtoupper($tcpflag);?>
                           </strong></td>
                         <td nowrap> <input type="radio" name="tcpflags_<?=$tcpflag;?>" value="on" <?php if (array_search($tcpflag, $inflags) !== false) { echo "checked"; $dontcare = false; }?>>
@@ -741,18 +743,18 @@ function dst_rep_change() {
                       </tr>
                       <?php endforeach; ?>
                     </table>
-                    <span class="vexpl">Use this to choose TCP flags that must 
+                    <span class="vexpl">Use this to choose TCP flags that must
                     be set or cleared for this rule to match.</span></td>
                 </tr>
-                <tr> 
+                <tr>
                   <td width="22%" valign="top" class="vncell">Description</td>
-                  <td width="78%" class="vtable"> <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"> 
-                    <br> <span class="vexpl">You may enter a description here 
+                  <td width="78%" class="vtable"> <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
+                    <br> <span class="vexpl">You may enter a description here
                     for your reference (not parsed).</span></td>
                 </tr>
-                <tr> 
+                <tr>
                   <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%"> <input name="Submit" type="submit" class="formbtn" value="Save"> 
+                  <td width="78%"> <input name="Submit" type="submit" class="formbtn" value="Save">
                     <?php if (isset($id) && $a_shaper[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>