diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-11-19 19:09:04 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-11-19 19:09:04 +0000 |
| commit | 605fe87fbb1f6f804ae9f15071586b1ecc93bf4a (patch) | |
| tree | 8e141af56bb7bf8169040315e0a373ad940def17 | |
| parent | f80f319452353335e7fde8cce59d1c0bb99966b1 (diff) | |
| download | pfsense-605fe87fbb1f6f804ae9f15071586b1ecc93bf4a.zip pfsense-605fe87fbb1f6f804ae9f15071586b1ecc93bf4a.tar.gz | |
MFC 14296
allow for the most stupid config ever
if user selects nothing but p2pcatchall, allow them to be stupid and put
all traffic in the p2p queue, effectively negating all benefits of shaping
| -rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard.inc | 5 | ||||
| -rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard.xml | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc index b296cfc..3dbde55 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard.inc @@ -330,6 +330,9 @@ function step4_stepsubmitphpaction() { $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); + if($_POST['p2pcatchall'] != "") + $config['shaper']['itemsshaped']++; + $p2plist = array(); /* To add p2p clients, push Descr,Protocol,Start,End,src/dest/both onto p2plist */ @@ -1091,4 +1094,4 @@ function step8_stepsubmitphpaction() { } -?>
\ No newline at end of file +?> diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml index 46c2188..dd0cdfe 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard.xml @@ -273,7 +273,7 @@ <type>checkbox</type> <typehint>Lower priority of 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,Shareaza,SongSpy,WinMX</enablefields> + <enablefields>p2pCatchAll,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> @@ -285,7 +285,6 @@ <type>listtopic</type> </field> <field> - <donotdisable>true</donotdisable> <name>p2pCatchAll</name> <type>checkbox</type> <typehint>When enabled, all uncategorized traffic is fed to the p2p queue.</typehint> |
