diff options
| author | Ermal <eri@pfsense.org> | 2014-02-20 19:30:28 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-02-20 19:30:28 +0000 |
| commit | a23ff10708456901c8f6f2d04944f4d7cb117ec6 (patch) | |
| tree | 900b37d739998b6a556fcfc362b843f0710ba3f5 /etc | |
| parent | ea188e4587d00e4cce54f2036ed7dd1fa791d904 (diff) | |
| download | pfsense-a23ff10708456901c8f6f2d04944f4d7cb117ec6.zip pfsense-a23ff10708456901c8f6f2d04944f4d7cb117ec6.tar.gz | |
Use the default bw specification if configured even for allowed ip and hostname.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 1941ef8..cad4903 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1011,8 +1011,16 @@ function captiveportal_allowedip_configure_entry($ipent, $ishostname = false) { $rules = ""; $cp_filterdns_conf = ""; - $enBwup = empty($ipent['bw_up']) ? 0 : intval($ipent['bw_up']); - $enBwdown = empty($ipent['bw_down']) ? 0 : intval($ipent['bw_down']); + $enBwup = 0; + if (!empty($ipent['bw_up'])) + $enBwup = iintval($ipent['bw_up']); + else if (isset($config['captiveportal'][$cpzone]['bwdefaultup'])) + $enBwup = $config['captiveportal'][$cpzone]['bwdefaultup']; + $enBwdown = 0; + if (!empty($ipent['bw_down'])) + $enBwdown = intval($ipent['bw_down']); + else if (isset($config['captiveportal'][$cpzone]['bwdefaultdn'])) + $enBwdown = $config['captiveportal'][$cpzone]['bwdefaultdn']; $pipeno = captiveportal_get_next_dn_ruleno(); $_gb = @pfSense_pipe_action("pipe {$pipeno} config bw {$enBwup}Kbit/s queue 100 buckets 16"); |
