send in by Florian Ehlig:

Added Games
    * DOOM3
    * Empire Earth
    * Everquest
    * Far Cry
    * HalfLife2
    * HalfLife
    * Wolfenstein Enemy Territory
Added Apps at  'Other Networikg Protocols'
    * Apple Remote Desktop
    * ICQ
    * Lotus Notes
    * MSN Messenger
    * My SQL Server
    * PC Anywhere
    * TeamSpeak
Corrected copy/paste error
    * DeltaForce Ports

some alphabetical sorting

1 files changed, 303 insertions, 23 deletions

diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml
index 26b9c9b..6322e91 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard.xml
@@ -427,11 +427,8 @@
 			    
 			    /* asterisk server / same as vonage somewhat */
 			    if( $_POST['provider'] == "Asterisk") {
-				$voiplist[] = array('Asterisk MGCP', 'udp', '2727', '2727', 'both');
-				$voiplist[] = array('Asterisk IAX', 'udp', '4569', '4569', 'both');
-				$voiplist[] = array('Asterisk IAX-2', 'udp', '5036', '5036', 'both');
-				$voiplist[] = array('Asterisk RTP', 'udp', '5060', '5069', 'both');
-				$voiplist[] = array('Asterisk SIP', 'udp', '10000', '20000', 'both');
+				$voiplist[] = array('Asterisk', 'udp', '5060', '5069', 'both');
+				$voiplist[] = array('Asterisk', 'udp', '10000', '17226', 'both');
 			    }
 
 			    /* VoicePulse server */
@@ -496,7 +493,7 @@
                         <type>checkbox</type>
                         <typehint>Prioritize Peer-to-Peer traffic</typehint>
                         <description>This will lower the priority of P2P traffic below all other traffic.  Please check the items that you would like to prioritize lower than normal traffic.</description>
-			<enablefields>Aimster,BitTorrent,BuddyShare,CuteMX,DCplusplus,dcc,DirectConnect,DirectFileExpress,EDonkey2000,FastTrack,Gnutella,grouper,hotComm,HotlineConnect,iMesh,Napster,OpenNap,Scour,SongSpy,WinMX</enablefields>
+			<enablefields>Aimster,BitTorrent,BuddyShare,CuteMX,DCplusplus,dcc,DirectConnect,DirectFileExpress,EDonkey2000,FastTrack,Gnutella,grouper,hotComm,HotlineConnect,iMesh,Napster,OpenNap,Scour,Shareaza,SongSpy,WinMX</enablefields>
 			<bindstofield>ezshaper->step4->enable</bindstofield>
                 </field>
                 <field>
@@ -616,6 +613,12 @@
 			<bindstofield>ezshaper->step4->scour</bindstofield>
                 </field>
                 <field>
+                        <name>Shareaza</name>
+                        <type>checkbox</type>
+			<typehint>Shareaza and other P2P using the Shareaza protocol and ports</typehint>
+			<bindstofield>ezshaper->step4->shareaza</bindstofield>
+                </field>
+                <field>
                         <name>SongSpy</name>
                         <type>checkbox</type>
 			<typehint>SongSpy and other P2P using the SongSpy protocol and ports</typehint>
@@ -676,6 +679,8 @@
 		    $p2plist[] = array('OpenNap', 'tcp', '8888', '8889', 'both');
 		if($_POST['scour'] != "") 		
 		    $p2plist[] = array('Scour', 'tcp', '8311', '8311', 'both');
+		if($_POST['shareaza'] != "") 		
+		    $p2plist[] = array('Shareaza', 'tcp', '6346', '6346', 'both');
 		if($_POST['songspy'] != "") 		
 		    $p2plist[] = array('SongSpy', 'tcp', '5190', '5190', 'both');
 		if($_POST['winmx'] != "") 		
@@ -774,7 +779,7 @@
                         <type>checkbox</type>
                         <typehint>Prioritize network gaming traffic</typehint>
                         <description>This will raise the priority of gaming traffic to higher than most traffic.</description>
-			<enablefields>Counterstrike,DeltaForce,QuakeIII,TigerWoods2004PS2,CallOfDuty,PlanetSide,Halo2,Unreal</enablefields>
+			<enablefields>Counterstrike,DeltaForce,QuakeIII,TigerWoods2004PS2,CallOfDuty,PlanetSide,Halo2,Unreal,DOOM3,EmpireEarth,Everquest,FarCry,HalfLife2,HalfLife,WolfensteinEnemyTerritory</enablefields>
 			<donotdisable>true</donotdisable>
 			<bindstofield>ezshaper->step5->enable</bindstofield>
                 </field>
@@ -787,6 +792,12 @@
                         <type>listtopic</type>
                 </field>		
                 <field>
+                        <name>CallOfDuty</name>
+                        <type>checkbox</type>
+			<typehint>Call Of Duty (United Offensive)</typehint>
+			<bindstofield>ezshaper->step5->callofduty</bindstofield>
+                </field>
+                <field>
                         <name>Counterstrike</name>
                         <type>checkbox</type>
 			<typehint>Counterstrike.   The ultimate 1st person shooter.</typehint>
@@ -799,28 +810,40 @@
 			<bindstofield>ezshaper->step5->deltaforce</bindstofield>
                 </field>
                 <field>
-                        <name>QuakeIII</name>
+                        <name>DOOM3</name>
                         <type>checkbox</type>
-			<typehint>Quake III</typehint>
-			<bindstofield>ezshaper->step5->quakeiii</bindstofield>
+			<typehint>DOOM3</typehint>
+			<bindstofield>ezshaper->step5->doom3</bindstofield>
                 </field>
                 <field>
-                        <name>TigerWoods2004PS2</name>
+                        <name>EmpireEarth</name>
                         <type>checkbox</type>
-			<typehint>Tiger Woods 2004 for PS2</typehint>
-			<bindstofield>ezshaper->step5->tigerwoods2004ps2</bindstofield>
+			<typehint>Empire Earth</typehint>
+			<bindstofield>ezshaper->step5->empireearth</bindstofield>
                 </field>
                 <field>
-                        <name>CallOfDuty</name>
+                        <name>Everquest</name>
                         <type>checkbox</type>
-			<typehint>Call Of Duty (United Offensive)</typehint>
-			<bindstofield>ezshaper->step5->callofduty</bindstofield>
+			<typehint>Everquest</typehint>
+			<bindstofield>ezshaper->step5->everquest</bindstofield>
                 </field>
                 <field>
-                        <name>PlanetSide</name>
+                        <name>FarCry</name>
                         <type>checkbox</type>
-			<typehint>PlanetSide</typehint>
-			<bindstofield>ezshaper->step5->planetside</bindstofield>
+			<typehint>Far Cry</typehint>
+			<bindstofield>ezshaper->step5->farcry</bindstofield>
+                </field>
+                <field>
+                        <name>HalfLife</name>
+                        <type>checkbox</type>
+			<typehint>HalfLife</typehint>
+			<bindstofield>ezshaper->step5->halflife</bindstofield>
+                </field>
+                <field>
+                        <name>HalfLife2</name>
+                        <type>checkbox</type>
+			<typehint>HalfLife 2</typehint>
+			<bindstofield>ezshaper->step5->halflife2</bindstofield>
                 </field>
                 <field>
                         <name>Halo2</name>
@@ -829,11 +852,35 @@
 			<bindstofield>ezshaper->step5->halo2xbox</bindstofield>
                 </field>
                 <field>
+                        <name>PlanetSide</name>
+                        <type>checkbox</type>
+			<typehint>PlanetSide</typehint>
+			<bindstofield>ezshaper->step5->planetside</bindstofield>
+                </field>
+                <field>
+                        <name>QuakeIII</name>
+                        <type>checkbox</type>
+			<typehint>Quake III</typehint>
+			<bindstofield>ezshaper->step5->quakeiii</bindstofield>
+                </field>
+                <field>
+                        <name>TigerWoods2004PS2</name>
+                        <type>checkbox</type>
+			<typehint>Tiger Woods 2004 for PS2</typehint>
+			<bindstofield>ezshaper->step5->tigerwoods2004ps2</bindstofield>
+                </field>
+                <field>
                         <name>Unreal</name>
                         <type>checkbox</type>
 			<typehint>Unreal tournament</typehint>
 			<bindstofield>ezshaper->step5->unreal</bindstofield>
-                </field>		
+                </field>
+                <field>
+                        <name>WolfensteinEnemyTerritory</name>
+                        <type>checkbox</type>
+			<typehint>Wolfenstein Enemy Territory</typehint>
+			<bindstofield>ezshaper->step5->wolfet</bindstofield>
+                </field>
                 <field>
                         <name>Next</name>
                         <type>submit</type>
@@ -910,7 +957,7 @@
 
 		if($_POST['quakeiii'] != "") {
 		    /* quake3 */
-		    $gamesplist[] = array('Delta1', 'udp', '27910', '27919', 'both');
+		    $gamesplist[] = array('quakeiii', 'udp', '27910', '27919', 'both');
 		}
 
 		if($_POST['tigerwoods2004ps2'] != "") {
@@ -947,6 +994,51 @@
 		    $gamesplist[] = array('ur2', 'tcp', '7777', '7787', 'both');
 		}
 
+		if($_POST['doom3'] != "") {
+		    /* doom3 */
+		    $gamesplist[] = array('DOOM3-1', 'udp', '27650', '27650', 'both');
+		    $gamesplist[] = array('DOOM3-2', 'udp', '27666', '27666', 'both');
+		}
+
+		if($_POST['empireearth'] != "") {
+		    /* empire earth */
+		    $gamesplist[] = array('EmpireEarth-1', 'tcp', '33335', '33336', 'both');
+		    $gamesplist[] = array('EmpireEarth-2', 'udp', '33334', '33334', 'both');
+		}
+
+		if($_POST['everquest'] != "") {
+		    /* everquest */
+		    $gamesplist[] = array('Everquest-1', 'tcp', '1024', '6000', 'both');
+		    $gamesplist[] = array('Everquest-2', 'tcp', '7000', '7000', 'both');
+		    $gamesplist[] = array('Everquest-3', 'udp', '1024', '6000', 'both');
+		    $gamesplist[] = array('Everquest-4', 'udp', '7000', '7000', 'both');
+		}
+
+		if($_POST['farcry'] != "") {
+		    /* far cry */
+		    $gamesplist[] = array('FarCry-1', 'tcp', '49001', '49002', 'both');
+		    $gamesplist[] = array('FarCry-2', 'udp', '49001', '49002', 'both');
+		}
+
+		if($_POST['halflife2'] != "") {
+		    /* halflife 2 */
+		    $gamesplist[] = array('HL2-1', 'tcp', '27020', '27050', 'both');
+		    $gamesplist[] = array('HL2-2', 'udp', '1200', '1200', 'both');
+		    $gamesplist[] = array('HL2-3', 'udp', '27000', '27015', 'both');
+		}
+
+		if($_POST['halflife'] != "") {
+		    /* halflife */
+		    $gamesplist[] = array('HL-1', 'tcp', '27015', '27015', 'both');
+		    $gamesplist[] = array('HL-2', 'udp', '27650', '27650', 'both');
+		    $gamesplist[] = array('HL-3', 'udp', '27666', '27666', 'both');
+		}
+
+		if($_POST['wolfet'] != "") {
+		    /* wolfenstein enemy territory */
+		    $gamesplist[] = array('WolfET-1', 'tcp', '27960', '27960', 'both');
+		}
+
 		/* XXX: add some more games before this line!! */
     
 		/* Set up/down games as higher weight */
@@ -994,7 +1086,7 @@
                         <type>checkbox</type>
                         <typehint>Other networking protocols</typehint>
                         <description>This will help raise or lower the priority of other protocols higher than most traffic.</description>
-			<enablefields>MSRDP,PPTP,IPSEC,StreamingMP3,IRC,DNS,HTTP,SMTP,POP3,ICMP,IMAP,SMB,RTSP,SNMP,VNC</enablefields>
+			<enablefields>MSRDP,PPTP,IPSEC,StreamingMP3,IRC,DNS,HTTP,SMTP,POP3,ICMP,IMAP,SMB,RTSP,SNMP,VNC,AppleRemoteDesktop,ICQ,LotusNotes,MSN,MySqlServer,PCAnywhere,TeamSpeak</enablefields>
 			<donotdisable>true</donotdisable>
 			<bindstofield>ezshaper->step6->enable</bindstofield>
                 </field>
@@ -1307,6 +1399,147 @@
 			<typehint>Virtual Network Computing</typehint>
                 </field>			
                 <field>
+                        <name>AppleRemoteDesktop</name>
+			<bindstofield>ezshaper->step6->appleremotedesktop</bindstofield>
+			<type>select</type>
+			<options>
+				<option>
+					<name>Higher priority</name>
+					<value>H</value>
+				</option>
+				<option>
+					<name>Default priority</name>
+					<value></value>
+				</option>
+				<option>
+					<name>Lower priority</name>
+					<value>L</value>
+				</option>
+			</options>
+			<typehint>Apple Remote Desktop</typehint>
+                </field>
+                <field>
+                        <name>ICQ</name>
+			<bindstofield>ezshaper->step6->icq</bindstofield>
+			<type>select</type>
+			<options>
+				<option>
+					<name>Higher priority</name>
+					<value>H</value>
+				</option>
+				<option>
+					<name>Default priority</name>
+					<value></value>
+				</option>
+				<option>
+					<name>Lower priority</name>
+					<value>L</value>
+				</option>
+			</options>
+			<typehint>ICQ</typehint>
+                </field>
+                <field>
+                        <name>LotusNotes</name>
+			<bindstofield>ezshaper->step6->lotusnotes</bindstofield>
+			<type>select</type>
+			<options>
+				<option>
+					<name>Higher priority</name>
+					<value>H</value>
+				</option>
+				<option>
+					<name>Default priority</name>
+					<value></value>
+				</option>
+				<option>
+					<name>Lower priority</name>
+					<value>L</value>
+				</option>
+			</options>
+			<typehint>Lotus Notes</typehint>
+                </field>
+                <field>
+                        <name>MSN</name>
+			<bindstofield>ezshaper->step6->msnmessenger</bindstofield>
+			<type>select</type>
+			<options>
+				<option>
+					<name>Higher priority</name>
+					<value>H</value>
+				</option>
+				<option>
+					<name>Default priority</name>
+					<value></value>
+				</option>
+				<option>
+					<name>Lower priority</name>
+					<value>L</value>
+				</option>
+			</options>
+			<typehint>MSN Messenger</typehint>
+                </field>
+                <field>
+                        <name>MySQLServer</name>
+			<bindstofield>ezshaper->step6->mysqlserver</bindstofield>
+			<type>select</type>
+			<options>
+				<option>
+					<name>Higher priority</name>
+					<value>H</value>
+				</option>
+				<option>
+					<name>Default priority</name>
+					<value></value>
+				</option>
+				<option>
+					<name>Lower priority</name>
+					<value>L</value>
+				</option>
+			</options>
+			<typehint>MySQL Server</typehint>
+                </field>
+                <field>
+                        <name>PCAnywhere</name>
+			<bindstofield>ezshaper->step6->pcanywhere</bindstofield>
+			<type>select</type>
+			<options>
+				<option>
+					<name>Higher priority</name>
+					<value>H</value>
+				</option>
+				<option>
+					<name>Default priority</name>
+					<value></value>
+				</option>
+				<option>
+					<name>Lower priority</name>
+					<value>L</value>
+				</option>
+			</options>
+			<typehint>Symantec PC Anywhere</typehint>
+                </field>
+                <field>
+                        <name>Teamspeak</name>
+			<bindstofield>ezshaper->step6->teamspeak</bindstofield>
+			<type>select</type>
+			<options>
+				<option>
+					<name>Higher priority</name>
+					<value>H</value>
+				</option>
+				<option>
+					<name>Default priority</name>
+					<value></value>
+				</option>
+				<option>
+					<name>Lower priority</name>
+					<value>L</value>
+				</option>
+			</options>
+			<typehint>TeamSpeak</typehint>
+                </field>
+                
+                <field>
                         <name>Next</name>
                         <type>submit</type>
                 </field>
@@ -1491,10 +1724,57 @@
 		}
 
 		if($_POST['vnc'] != "") {
-		    /* Simple network management protocol */
+		    /* virtual network control */
 		    $othersplist[] = array('VNC', 'tcp', '5900', '5930', 'both', $_POST['vnc']);
 		}		
 
+		if($_POST['appleremotedesktop'] != "") {
+		    /* apple remote desktop */
+		    $othersplist[] = array('AppleRemoteDesktop1', 'tcp', '3283', '3283', 'both', $_POST['appleremotedesktop']);
+		    $othersplist[] = array('AppleRemoteDesktop2', 'tcp', '5900', '5900', 'both', $_POST['appleremotedesktop']);
+		    $othersplist[] = array('AppleRemoteDesktop3', 'udp', '3283', '3283', 'both', $_POST['appleremotedesktop']);
+		    $othersplist[] = array('AppleRemoteDesktop4', 'udp', '5900', '5900', 'both', $_POST['appleremotedesktop']);
+		}		
+
+		if($_POST['icq'] != "") {
+		    /* icq */
+		    $othersplist[] = array('ICQ1', 'tcp', '5190', '5190', 'both', $_POST['icq']);
+		    $othersplist[] = array('ICQ2', 'udp', '5190', '5190', 'both', $_POST['icq']);
+		}		
+		
+		if($_POST['lotusnotes'] != "") {
+		    /* lotus notes */
+		    $othersplist[] = array('LotusNotes1', 'tcp', '1352', '1352', 'both', $_POST['lotusnotes']);
+		    $othersplist[] = array('LotusNotes2', 'udp', '1352', '1352', 'both', $_POST['lotusnotes']);
+		}		
+
+		if($_POST['msnmessenger'] != "") {
+		    /* msn messenger */
+		    $othersplist[] = array('MSN1', 'tcp', '1863', '1863', 'both', $_POST['msnmessenger']);
+		    $othersplist[] = array('MSN2', 'tcp', '6891', '6900', 'both', $_POST['msnmessenger']);
+		    $othersplist[] = array('MSN3', 'tcp', '6901', '6901', 'both', $_POST['msnmessenger']);
+		    $othersplist[] = array('MSN4', 'udp', '6901', '6901', 'both', $_POST['msnmessenger']);
+		}		
+
+		if($_POST['mysqlserver'] != "") {
+		    /* mysql server */
+		    $othersplist[] = array('MySQL1', 'tcp', '3306', '3306', 'both', $_POST['mysqlserver']);
+		}		
+
+		if($_POST['pcanwhere'] != "") {
+		    /* symantec pc anywhere */
+		    $othersplist[] = array('pcany1', 'tcp', '5631', '5631', 'both', $_POST['pcanywhere']);
+		    $othersplist[] = array('pcany2', 'udp', '5632', '5632', 'both', $_POST['pcanywhere']);
+		    }		
+
+		if($_POST['teamspeak'] != "") {
+		    /* teamspeak  */
+		    $othersplist[] = array('teamspeak1', 'tcp', '14534', '14534', 'both', $_POST['teamspeak']);
+		    $othersplist[] = array('teamspeak2', 'tcp', '51234', '51234', 'both', $_POST['teamspeak']);
+		    $othersplist[] = array('teamspeak3', 'udp', '8767', '8768', 'both', $_POST['teamspeak']);
+		}		
+
+
 		/* XXX: add some more protocols here! */
     
 		/* Set up/down protocols as higher weight */