mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix number of WAN / LAN interfaces detection for dedicated wizard

Browse Source
This commit is contained in:
Renato Botelho 2014-07-24 18:20:09 -03:00
parent 46cbc96e09
commit e75a787fca
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
View File

@ -36,6 +36,7 @@ function step1_stepbeforeformdisplay() {
$fields =& $pkg['step'][0]['fields']['field'];
$wans = 0;
$lans = 0;
$iflisttmp = get_configured_interface_with_descr();
foreach ($iflisttmp as $if => $ifdesc) {
@ -43,11 +44,13 @@ function step1_stepbeforeformdisplay() {
continue;
if (interface_has_gateway($if) || interface_has_gatewayv6($if))
$wans++;
else
$lans++;
}
foreach ($fields as &$field)
if ($field['name'] == 'numberofconnections')
$field['value'] = $wans;
$field['value'] = ($wans < $lans ? $wans : $lans);
}
function step1_submitphpaction() {
@ -69,17 +72,21 @@ function step2_stepbeforeformdisplay() {
global $config, $pkg;
global $stepid, $savemsg;
$numberofinterfaces = 0;
$wans = 0;
$lans = 0;
$iflist = array();
$iflisttmp = get_configured_interface_with_descr();
foreach ($iflisttmp as $if => $ifdesc) {
if (!is_altq_capable(get_real_interface($if)))
continue;
$numberofinterfaces++;
if (interface_has_gateway($if) || interface_has_gatewayv6($if))
$wans++;
else
$lans++;
$iflist[$if] = $ifdesc;
}
$numberofconnections = intval($config['ezshaper']['step1']['numberofconnections']);
if ($numberofconnections > ($numberofinterfaces/2)) {
if ($numberofconnections > ($wans < $lans ? $wans : $lans)) {
$savemsg=gettext("You have less interfaces than number of connections!");
$stepid--;
return;