diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-04-02 01:57:31 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-04-02 01:57:31 +0000 |
| commit | 997ec02a82c1e849b34540956ce9a37cc62d97f4 (patch) | |
| tree | c84c91d41e36e53762818192af4b277f02d05ee3 /usr/local | |
| parent | 039c417854f9ccaa5fdadf33bbc2cf38bb404a35 (diff) | |
| download | pfsense-997ec02a82c1e849b34540956ce9a37cc62d97f4.zip pfsense-997ec02a82c1e849b34540956ce9a37cc62d97f4.tar.gz | |
Add p2p catch all rules *AFTER* sorting rules by priority
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard.xml | 81 |
1 files changed, 40 insertions, 41 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml index bb28ded..c32009e 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard.xml @@ -2018,6 +2018,46 @@ $config['shaper']['rule'][] = $rule; } } + } + </stepsubmitphpaction> +</step> +<step> + <id>7</id> + <title>pfSense Traffic Shaper Wizard</title> + <field> + <name>Reload profile notice</name> + <type>listtopic</type> + </field> + <description> + After pressing Finish the system will load the new profile.<br/> + Please note that this may take a moment.<br/> + Also note that the traffic shaper is stateful meaning that only new connections will be shaped.<br/> + If this is an issue please reset the state table after loading the profile.<br/> + </description> + <fields> + <field> + <name>Finish</name> + <type>submit</type> + </field> + </fields> + <stepbeforeformdisplay> + if($config['shaper']['itemsshaped'] == "0") { + /* no shaper items have been selected + * wipe previous + */ + unset($config['shaper']['queue']); + unset($config['shaper']['rule']); + unset($config['shaper']); + $config['shaper']['enable'] = FALSE; + $message = "No items have been selected to shape. Exiting traffic shaper wizard."; + write_config("No shaper items picked, unsetting shaper configuration"); + header("Location: /wizard.php?xml=traffic_shaper_wizard.xml&stepid=7&message={$message}"); + exit; + } + </stepbeforeformdisplay> + <stepsubmitphpaction> + /* Sort rules by queue priority */ + sort_rule_by_queue_priority(); /* install default p2p catch all rule if user has enabled option (MUST BE LAST!) */ if($config['ezshaper']['step4']['p2pcatchall'] == "on") { @@ -2063,47 +2103,6 @@ $config['shaper']['rule'][] = $rule; } } - - } - </stepsubmitphpaction> -</step> -<step> - <id>7</id> - <title>pfSense Traffic Shaper Wizard</title> - <field> - <name>Reload profile notice</name> - <type>listtopic</type> - </field> - <description> - After pressing Finish the system will load the new profile.<br/> - Please note that this may take a moment.<br/> - Also note that the traffic shaper is stateful meaning that only new connections will be shaped.<br/> - If this is an issue please reset the state table after loading the profile.<br/> - </description> - <fields> - <field> - <name>Finish</name> - <type>submit</type> - </field> - </fields> - <stepbeforeformdisplay> - if($config['shaper']['itemsshaped'] == "0") { - /* no shaper items have been selected - * wipe previous - */ - unset($config['shaper']['queue']); - unset($config['shaper']['rule']); - unset($config['shaper']); - $config['shaper']['enable'] = FALSE; - $message = "No items have been selected to shape. Exiting traffic shaper wizard."; - write_config("No shaper items picked, unsetting shaper configuration"); - header("Location: /wizard.php?xml=traffic_shaper_wizard.xml&stepid=7&message={$message}"); - exit; - } - </stepbeforeformdisplay> - <stepsubmitphpaction> - /* Sort rules by queue priority */ - sort_rule_by_queue_priority(); /* Enable shaper */ $config['shaper']['enable'] = TRUE; |
