diff options
| author | Chris Buechler <cmb@pfsense.org> | 2008-02-03 05:47:06 +0000 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2008-02-03 05:47:06 +0000 |
| commit | a8e5fc7ffbb056bfb2d8ab06a35040559a152069 (patch) | |
| tree | cd31f3c219cc98622d2bb7a4f0a6c8173225b301 | |
| parent | 0a532641b4c9875b7ec5ab5869545b8407baf4a3 (diff) | |
| download | pfsense-a8e5fc7ffbb056bfb2d8ab06a35040559a152069.zip pfsense-a8e5fc7ffbb056bfb2d8ab06a35040559a152069.tar.gz | |
Trim long interface names to prevent broken rulesets.
Ticket #1612
| -rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard.inc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc index bd06153..2fdfbcc 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard.inc @@ -52,8 +52,8 @@ function step2_stepsubmitphpaction() { header("Location: /wizard.php?xml=traffic_shaper_wizard.xml&stepid=1&message={$message}"); exit; } - $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); - $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); + $downq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']),0,8); + $upq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']),0,8); /* Magic shaper scheduler */ $config['shaper']['schedulertype'] = "hfsc"; @@ -176,8 +176,8 @@ function step3_stepsubmitphpaction() { } if ( $_POST['enable'] ) { - $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); - $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); + $downq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']),0,8); + $upq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']),0,8); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); @@ -340,8 +340,8 @@ function step4_stepsubmitphpaction() { } if ( $_POST['enable'] ) { - $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); - $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); + $downq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']),0,8); + $upq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']),0,8); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); @@ -430,8 +430,8 @@ function step5_stepsubmitphpaction() { /* XXX - billm - needs to actually honor what the user selects still */ if ( $_POST['enable'] ) { - $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); - $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); + $downq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']),0,8); + $upq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']),0,8); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); @@ -579,8 +579,8 @@ function step6_stepsubmitphpaction() { global $g, $config; /* XXX - billm - needs to actually honor what the user selects still */ if ( $_POST['enable'] ) { - $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); - $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); + $downq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']),0,8); + $upq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']),0,8); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); @@ -825,8 +825,8 @@ function step6_stepsubmitphpaction() { function step7_stepsubmitphpaction() { global $g, $config; if ( $_POST['enable'] ) { - $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); - $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); + $downq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']),0,8); + $upq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']),0,8); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); /* create qOthersUp queue */ @@ -1145,8 +1145,8 @@ function step8_stepsubmitphpaction() { /* Sort rules by queue priority */ sort_rule_by_queue_priority(); - $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); - $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); + $downq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']),0,8); + $upq = "q" . substr(convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']),0,8); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); |
