diff options
| author | Ermal <eri@pfsense.org> | 2014-02-20 19:30:28 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-02-20 19:30:57 +0000 |
| commit | 2e080989c4f52ebadd59e40fb05227d3a729af2b (patch) | |
| tree | c91ed1c5f7163a3b8dc507ac376a7656ae074e4e /etc | |
| parent | 08185f4aa2282077e2e1f15baad5593352123d68 (diff) | |
| download | pfsense-2e080989c4f52ebadd59e40fb05227d3a729af2b.zip pfsense-2e080989c4f52ebadd59e40fb05227d3a729af2b.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 fc813ad..daf7b18 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1038,8 +1038,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"); |
