diff options
| author | Jonatan Ramos <jntramosbonilla@protonmail.com> | 2016-09-05 16:37:12 +0100 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-07 12:32:10 -0200 |
| commit | c7cecab8518d62f4cc619ffc7bbbba7ba2a0ceb8 (patch) | |
| tree | de7aaf74941298ce570f23a95dd8c5cbe1dd2ba7 /src/etc/inc/captiveportal.inc | |
| parent | af41271bf44777377d198a43c9886f67d5d6b84f (diff) | |
| download | pfsense-c7cecab8518d62f4cc619ffc7bbbba7ba2a0ceb8.zip pfsense-c7cecab8518d62f4cc619ffc7bbbba7ba2a0ceb8.tar.gz | |
Fix bandwidth limitation in mac passthrough auth
(cherry picked from commit aa1c6774927fd6e1b11a9315900035c0e084fd82)
Diffstat (limited to 'src/etc/inc/captiveportal.inc')
| -rw-r--r-- | src/etc/inc/captiveportal.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc index b0f0444..0cb84bb 100644 --- a/src/etc/inc/captiveportal.inc +++ b/src/etc/inc/captiveportal.inc @@ -2155,6 +2155,15 @@ function portal_allow($clientip, $clientmac, $username, $password = null, $attri $tod = gettimeofday(); $sessionid = substr(md5(mt_rand() . $tod['sec'] . $tod['usec'] . $clientip . $clientmac), 0, 16); + if (isset($config['captiveportal'][$cpzone]['peruserbw'])) { + $dwfaultbw_up = !empty($config['captiveportal'][$cpzone]['bwdefaultup']) ? $config['captiveportal'][$cpzone]['bwdefaultup'] : 0; + $dwfaultbw_down = !empty($config['captiveportal'][$cpzone]['bwdefaultdn']) ? $config['captiveportal'][$cpzone]['bwdefaultdn'] : 0; + } else { + $dwfaultbw_up = $dwfaultbw_down = 0; + } + $bw_up = !empty($attributes['bw_up']) ? round(intval($attributes['bw_up'])/1000, 2) : $dwfaultbw_up; + $bw_down = !empty($attributes['bw_down']) ? round(intval($attributes['bw_down'])/1000, 2) : $dwfaultbw_down; + if ($passthrumac) { $mac = array(); $mac['action'] = 'pass'; @@ -2200,15 +2209,6 @@ function portal_allow($clientip, $clientmac, $username, $password = null, $attri return; } - if (isset($config['captiveportal'][$cpzone]['peruserbw'])) { - $dwfaultbw_up = !empty($config['captiveportal'][$cpzone]['bwdefaultup']) ? $config['captiveportal'][$cpzone]['bwdefaultup'] : 0; - $dwfaultbw_down = !empty($config['captiveportal'][$cpzone]['bwdefaultdn']) ? $config['captiveportal'][$cpzone]['bwdefaultdn'] : 0; - } else { - $dwfaultbw_up = $dwfaultbw_down = 0; - } - $bw_up = !empty($attributes['bw_up']) ? round(intval($attributes['bw_up'])/1000, 2) : $dwfaultbw_up; - $bw_down = !empty($attributes['bw_down']) ? round(intval($attributes['bw_down'])/1000, 2) : $dwfaultbw_down; - $bw_up_pipeno = $pipeno; $bw_down_pipeno = $pipeno + 1; //$bw_up /= 1000; // Scale to Kbit/s |
