diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-08-09 22:07:09 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-08-09 22:07:09 +0000 |
commit | fb070988119bc5f16e583cc6aff6e3535fcc7f82 (patch) | |
tree | 7f07fc146123ef36d46cb7bbb5db233b5b9ff0d1 /usr | |
parent | 7a016866c658acc28d434d1a97a32d7791ee7c34 (diff) | |
download | pfsense-fb070988119bc5f16e583cc6aff6e3535fcc7f82.zip pfsense-fb070988119bc5f16e583cc6aff6e3535fcc7f82.tar.gz |
Revert to 1.85
Diffstat (limited to 'usr')
-rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard.xml | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml index 6e098c0..ed5070a 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard.xml @@ -48,10 +48,10 @@ /* wipe previous */ unset($config['shaper']['queue']); unset($config['shaper']['rule']); - unset($config['interfaces']["wan"]['bandwidth']); - unset($config['interfaces']["wan"]['bandwidthtype']); - unset($config['interfaces'][$config['ezshaper']['step2']['interface']]['bandwidth']); - unset($config['interfaces'][$config['ezshaper']['step2']['interface']]['bandwidthtype']); + unset($config['interfaces']['wan']['bandwidth']); + unset($config['interfaces']['wan']['bandwidthtype']); + unset($config['interfaces']['lan']['bandwidth']); + unset($config['interfaces']['lan']['bandwidthtype']); $config['shaper']['enable'] = FALSE; </stepsubmitphpaction> </step> @@ -79,14 +79,6 @@ <bindstofield>ezshaper->step2->upload</bindstofield> </field> <field> - <name>Interface</name> - <description>The other interface to apply Traffic Shaper settings to</description> - <type>interfaces_selection</type> - <value>lan</value> - <message>Will use WAN as default with the above selection</message> - <bindstofield>ezshaper->step2->interface</bindstofield> - </field> - <field> <name>Next</name> <type>submit</type> </field> @@ -404,8 +396,8 @@ $rule['descr'] = "DiffServ/Lowdelay/Upload"; $rule['inqueue'] = "qVOIPDown"; $rule['outqueue'] = "qVOIPUp"; - $rule['interface'] = $config['ezshaper']['step2']['interface']; - $rule['source']['network'] = $config['ezshaper']['step2']['interface']; + $rule['interface'] = "lan"; + $rule['source']['network'] = 'lan'; $rule['destination']['any'] = TRUE; $rule['iptos'] = "lowdelay"; $config['shaper']['rule'][] = $rule; @@ -416,7 +408,7 @@ $rule['outqueue'] = "qVOIPDown"; $rule['interface'] = "wan"; $rule['source']['any'] = TRUE; - $rule['destination']['network'] = $config['ezshaper']['step2']['interface']; + $rule['destination']['network'] = 'lan'; $rule['iptos'] = "lowdelay"; $config['shaper']['rule'][] = $rule; } else { @@ -455,17 +447,17 @@ $destsrc = 'destination'; $rule['outqueue'] = 'qVOIPUp'; $rule['inqueue'] = 'qVOIPDown'; - $rule['interface'] = $config['ezshaper']['step2']['interface']; - $rule['source']['network'] = $config['ezshaper']['step2']['interface']; + $rule['interface'] = 'lan'; + $rule['source']['network'] = 'lan'; $rule['destination']['any'] = TRUE; $rule['descr'] = "m_voip {$voip[0]} outbound"; } else { $destsrc = 'source'; $rule['outqueue'] = 'qVOIPDown'; $rule['inqueue'] = 'qVOIPUp'; - $rule['interface'] = "wan"; + $rule['interface'] = 'wan'; $rule['source']['any'] = TRUE; - $rule['destination']['network'] = $config['ezshaper']['step2']['interface']; + $rule['destination']['network'] = 'lan'; $rule['descr'] = "m_voip {$voip[0]} inbound"; } @@ -633,6 +625,7 @@ </fields> <stepsubmitphpaction> + /* XXX - billm - needs to actually honor what the user selects still */ if ( $_POST['enable'] ) { $p2plist = array(); @@ -688,17 +681,17 @@ $destsrc = 'destination'; $rule['outqueue'] = 'qP2PUp'; $rule['inqueue'] = 'qP2PDown'; - $rule['interface'] = $config['ezshaper']['step2']['interface']; - $rule['source']['network'] = $config['ezshaper']['step2']['interface']; + $rule['interface'] = 'lan'; + $rule['source']['network'] = 'lan'; $rule['destination']['any'] = TRUE; $rule['descr'] = "m_P2P {$p2pclient[0]} outbound"; } else { $destsrc = 'source'; $rule['outqueue'] = 'qP2PDown'; $rule['inqueue'] = 'qP2PUp'; - $rule['interface'] = "wan"; + $rule['interface'] = 'wan'; $rule['source']['any'] = TRUE; - $rule['destination']['network'] = $config['ezshaper']['step2']['interface']; + $rule['destination']['network'] = 'lan'; $rule['descr'] = "m_P2P {$p2pclient[0]} inbound"; } @@ -838,6 +831,7 @@ </field> </fields> <stepsubmitphpaction> + /* XXX - billm - needs to actually honor what the user selects still */ if ( $_POST['enable'] ) { /* create qGamesUp queue */ $queue = array(); @@ -943,6 +937,8 @@ $gamesplist[] = array('ur1', 'udp', '7777-7787', '7777-7787', 'both'); $gamesplist[] = array('ur2', 'tcp', '7777-7787', '7777-7787', 'both'); } + + /* XXX: add some more games before this line!! */ /* Set up/down games as higher weight */ /* loop through p2plist[] */ @@ -953,17 +949,17 @@ $destsrc = 'destination'; $rule['outqueue'] = 'qGamesUp'; $rule['inqueue'] = 'qGamesDown'; - $rule['interface'] = $config['ezshaper']['step2']['interface']; - $rule['source']['network'] = $config['ezshaper']['step2']['interface']; + $rule['interface'] = 'lan'; + $rule['source']['network'] = 'lan'; $rule['destination']['any'] = TRUE; $rule['descr'] = "m_Game {$Gameclient[0]} outbound"; } else { $destsrc = 'source'; $rule['outqueue'] = 'qGamesDown'; $rule['inqueue'] = 'qGamesUp'; - $rule['interface'] = "wan"; + $rule['interface'] = 'wan'; $rule['source']['any'] = TRUE; - $rule['destination']['network'] = $config['ezshaper']['step2']['interface']; + $rule['destination']['network'] = 'lan'; $rule['descr'] = "m_Game {$Gameclient[0]} inbound"; } @@ -1488,7 +1484,9 @@ if($_POST['vnc'] != "") { /* Simple network management protocol */ $othersplist[] = array('VNC', 'tcp', '5900-5930', '5900-5930', 'both', $_POST['vnc']); - } + } + + /* XXX: add some more protocols here! */ /* Set up/down protocols as higher weight */ /* loop through othersplist[] */ @@ -1499,17 +1497,17 @@ $destsrc = 'destination'; $rule['outqueue'] = 'qOthersUp' . $otherclient[5]; /* posted value H or L */ $rule['inqueue'] = 'qOthersDown' . $otherclient[5]; /* posted value H or L */ - $rule['interface'] = $config['ezshaper']['step2']['interface']; - $rule['source']['network'] = $config['ezshaper']['step2']['interface']; + $rule['interface'] = 'lan'; + $rule['source']['network'] = 'lan'; $rule['destination']['any'] = TRUE; $rule['descr'] = "m_Other {$otherclient[0]} outbound"; } else { $destsrc = 'source'; $rule['outqueue'] = 'qOthersDown' . $otherclient[5]; /* posted value H or L */ $rule['inqueue'] = 'qOthersUp' . $otherclient[5]; /* posted value H or L */ - $rule['interface'] = "wan"; + $rule['interface'] = 'wan'; $rule['source']['any'] = TRUE; - $rule['destination']['network'] = $config['ezshaper']['step2']['interface']; + $rule['destination']['network'] = 'lan'; $rule['descr'] = "m_Other {$otherclient[0]} inbound"; } |