diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-06-06 22:56:48 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-06-06 22:56:48 +0000 |
commit | fc4c39f599e99517eba62d76484e5d59bb1da105 (patch) | |
tree | 6988dd645fa1b1df6b688dae38fa571a9cb769d1 /usr/local | |
parent | 8c304753a909f7cc87ff0dff5585f43b9882b10b (diff) | |
download | pfsense-fc4c39f599e99517eba62d76484e5d59bb1da105.zip pfsense-fc4c39f599e99517eba62d76484e5d59bb1da105.tar.gz |
Unbreak shaper[tm]
Diffstat (limited to 'usr/local')
-rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard.xml | 67 |
1 files changed, 36 insertions, 31 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml index be7bf6e..e2697fb 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard.xml @@ -258,17 +258,21 @@ <typehint>Bandwidth guarantee for VOIP phone</typehint> <options> <option> + <name>1500Kbits/sec</name> + <value>1500</value> + </option> + <option> <name>1024Kbits/sec</name> <value>1024</value> - </option> + </option> <option> <name>768Kbits/sec</name> <value>768</value> - </option> + </option> <option> <name>512Kbits/sec</name> <value>512</value> - </option> + </option> <option> <name>384Kbits/sec</name> <value>384</value> @@ -542,45 +546,45 @@ if ( $_POST['enable'] ) { /* To add p2p clients, push Descr,Protocol,Start,End,src/dest/both onto p2plist */ - if($_POST['Aimster' != "") + if($_POST['Aimster'] != "") $p2plist[] = array('Aimster','tcp','7668','7668','both'); - if($_POST['BitTorrent' != "") + if($_POST['BitTorrent'] != "") $p2plist[] = array('BitTorrent','tcp','6881','6999','both'); - if($_POST['BuddyShare' != "") + if($_POST['BuddyShare'] != "") $p2plist[] = array('BuddyShare','tcp','7788','7788','both'); - if($_POST['CuteMX' != "") + if($_POST['CuteMX'] != "") $p2plist[] = array('CuteMX','tcp','2340','2340','both'); - if($_POST['DC++' != "") + if($_POST['DC++'] != "") $p2plist[] = array('DC++','tcp','1412','1412','both'); - if($_POST['dcc' != "") + if($_POST['dcc'] != "") $p2plist[] = array('dcc','tcp','6666','6668','both'); - if($_POST['DirectConnect' != "") + if($_POST['DirectConnect'] != "") $p2plist[] = array('DirectConnect','tcp','412','412','both'); - if($_POST['DirectFileExpress' != "") + if($_POST['DirectFileExpress'] != "") $p2plist[] = array('DirectFileExpress','tcp','1044','1045','both'); - if($_POST['EDonkey2000' != "") + if($_POST['EDonkey2000'] != "") $p2plist[] = array('EDonkey2000','tcp','4661','4665','both'); - if($_POST['FastTrack' != "") + if($_POST['FastTrack'] != "") $p2plist[] = array('FastTrack','tcp','1214','1214','both'); - if($_POST['Gnutella' != "") + if($_POST['Gnutella'] != "") $p2plist[] = array('Gnutella','tcp','6346','6346','both'); - if($_POST['grouper' != "") + if($_POST['grouper'] != "") $p2plist[] = array('grouper','tcp','8038','8039','both'); - if($_POST['hotComm' != "") + if($_POST['hotComm'] != "") $p2plist[] = array('hotComm','tcp','28864','28865','both'); - if($_POST['HotlineConnect' != "") + if($_POST['HotlineConnect'] != "") $p2plist[] = array('HotlineConnect','tcp','5500','5503','both'); - if($_POST['' != "") + if($_POST['iMesh'] != "") $p2plist[] = array('iMesh','tcp','4329','4329','both'); - if($_POST['Napster' != "") + if($_POST['Napster'] != "") $p2plist[] = array('Napster','tcp','6699','6701','both'); - if($_POST['OpenNap' != "") + if($_POST['OpenNap'] != "") $p2plist[] = array('OpenNap','tcp','8888','8889','both'); - if($_POST['Scour' != "") + if($_POST['Scour'] != "") $p2plist[] = array('Scour','tcp','8311','8311','both'); - if($_POST['SongSpy' != "") + if($_POST['SongSpy'] != "") $p2plist[] = array('SongSpy','tcp','5190','5190','both'); - if($_POST['WinMX' != "") + if($_POST['WinMX'] != "") $p2plist[] = array('WinMX','tcp','6699','6699','both'); /* Set up/down p2p as lowest weight */ @@ -766,7 +770,7 @@ $gamesplist = array(); - if($_POST['Counterstrike' != "") { + if($_POST['Counterstrike'] != "") { /* counter strike */ $gamesplist[] = array('Titan','udp','6003','6003','both'); $gamesplist[] = array('Authentication','udp','7002','7002','both'); @@ -777,24 +781,24 @@ $gamesplist[] = array('HL-Serverport ','udp','27015','27015','both'); } - if($_POST['DeltaForce' != "") { + if($_POST['DeltaForce'] != "") { /* delta force */ $gamesplist[] = array('Delta1','udp','17478','17488','both'); } - if($_POST['QuakeIII' != "") { + if($_POST['QuakeIII'] != "") { /* quake3 */ $gamesplist[] = array('Delta1','udp','27910','27919','both'); } - if($_POST['TigerWoods2004PS2' != "") { + if($_POST['TigerWoods2004PS2'] != "") { /* tiger woods 2004 ps2 */ $gamesplist[] = array('Outbound2Player','udp','3658','3658','both'); $gamesplist[] = array('Outbound2Player2','udp','6000','6000','both'); $gamesplist[] = array('Outbound2EA','tcp','10300','10301','both'); } - if($_POST['CallOfDuty' != "") { + if($_POST['CallOfDuty'] != "") { /* Call of Duty (United Offensive) */ $gamesplist[] = array('CallOfDuty1','tcp','28960','28960','both'); $gamesplist[] = array('CallOfDuty2','udp','28960','28960','both'); @@ -825,6 +829,7 @@ } $rule['destination']['port'] = $Gameclient[2]."-".$Gameclient[3]; + if($Gameclient[1] != '') $rule['protocol'] = $Gameclient[1]; @@ -922,18 +927,18 @@ $queue['attachtoqueue'] = "qLANRoot"; $config['shaper']['queue'][] = $queue; - if($_POST['MSRDP' != "") { + if($_POST['MSRDP'] != "") { /* MSRDP */ $othersplist[] = array('MSRDP','tcp','3389','3389','both'); } - if($_POST['PPTP' != "") { + if($_POST['PPTP'] != "") { /* PPTP */ $othersplist[] = array('PPTP','tcp','1723','1723','both'); $othersplist[] = array('PPTPGRE','gre','','','both'); } - if($_POST['IPSEC' != "") { + if($_POST['IPSEC'] != "") { /* IPSEC */ $othersplist[] = array('IPSEC','tcp','500','500','both'); } |