diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-06-07 02:28:41 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-06-07 02:28:41 +0000 |
commit | e09ceead417e022b0394a7520420bcc396bf0b5f (patch) | |
tree | 7cd2767cff1381018aac6c683abc300909f03782 /usr/local/www/wizards | |
parent | e855e6f40d91220b1e02ecf37606263790714418 (diff) | |
download | pfsense-e09ceead417e022b0394a7520420bcc396bf0b5f.zip pfsense-e09ceead417e022b0394a7520420bcc396bf0b5f.tar.gz |
Do not attempt to populate from array if user picks <> "Generic"
Diffstat (limited to 'usr/local/www/wizards')
-rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard.xml | 84 |
1 files changed, 43 insertions, 41 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml index 42c6d57..4d4afd6 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard.xml @@ -381,50 +381,52 @@ $rule['destination']['network'] = 'lan'; $rule['iptos'] = "lowdelay"; $config['shaper']['rule'][] = $rule; - } - - $voiplist[] = array(); - - /* setup vonage rule */ - if( $_POST['provider'] == "Vonage") - $voiplist[] = array('Vonage','udp','5060-5069','5060-5069','both'); + } else { - /* asterisk server / same as vonage somewhat */ - if( $_POST['provider'] == "Asterisk") - $voiplist[] = array('Vonage','udp','5060-5069','5060-5069','both'); - - /* Set up/down games as higher weight */ - /* loop through voiplist[] */ - foreach ($voiplist as $voip) { - foreach (array('source','destination') as $srcdest) { - $rule = array(); - if ($srcdest == 'source') { - $destsrc = 'destination'; - $rule['outqueue'] = 'qVOIPUp'; - $rule['inqueue'] = 'qVOIPDown'; - $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['source']['any'] = TRUE; - $rule['destination']['network'] = 'lan'; - $rule['descr'] = "m_voip {$voip[0]} inbound"; - } + $voiplist[] = array(); - $rule['destination']['port'] = $voip[2]."-".$voip[3]; - if($voip[1] != '') - $rule['protocol'] = $voip[1]; + /* setup vonage rule */ + if( $_POST['provider'] == "Vonage") + $voiplist[] = array('Vonage','udp','5060-5069','5060-5069','both'); + + /* asterisk server / same as vonage somewhat */ + if( $_POST['provider'] == "Asterisk") + $voiplist[] = array('Vonage','udp','5060-5069','5060-5069','both'); - $config['shaper']['rule'][] = $rule; - - } - } - + /* Set up/down games as higher weight */ + /* loop through voiplist[] */ + foreach ($voiplist as $voip) { + foreach (array('source','destination') as $srcdest) { + $rule = array(); + if ($srcdest == 'source') { + $destsrc = 'destination'; + $rule['outqueue'] = 'qVOIPUp'; + $rule['inqueue'] = 'qVOIPDown'; + $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['source']['any'] = TRUE; + $rule['destination']['network'] = 'lan'; + $rule['descr'] = "m_voip {$voip[0]} inbound"; + } + + if($voip[2]) { + $rule['destination']['port'] = $voip[2]."-".$voip[3]; + if($voip[1] != '') + $rule['protocol'] = $voip[1]; + } + + $config['shaper']['rule'][] = $rule; + + } + } + } } </stepsubmitphpaction> |