diff options
| author | Renato Botelho <renato@netgate.com> | 2017-09-21 15:10:02 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-09-21 15:10:09 -0300 |
| commit | 0116f1c9bbf1a532fdd49c346c41b761c1e59d93 (patch) | |
| tree | 82f9be7df55879091a30830c42712366d8b01157 /src/etc/inc | |
| parent | 1841c040735eb28cd0f10faaf50639c2454c6bef (diff) | |
| download | pfsense-0116f1c9bbf1a532fdd49c346c41b761c1e59d93.zip pfsense-0116f1c9bbf1a532fdd49c346c41b761c1e59d93.tar.gz | |
Do not associate IP and MAC on down table. It should help #7813 and #7833
Diffstat (limited to 'src/etc/inc')
| -rw-r--r-- | src/etc/inc/captiveportal.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc index 81ce9e3..bcb3c75 100644 --- a/src/etc/inc/captiveportal.inc +++ b/src/etc/inc/captiveportal.inc @@ -2304,11 +2304,13 @@ function portal_allow($clientip, $clientmac, $username, $password = null, $attri $_gb = @pfSense_ipfw_pipe("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100 buckets 16"); $rule_entry = "{$clientip}/" . (is_ipaddrv6($clientip) ? "128" : "32"); + $_gb = @pfSense_ipfw_table("{$cpzone}_auth_down", IP_FW_TABLE_XADD, "{$rule_entry}", $bw_down_pipeno); + + /* Add MAC address on UP rule only */ if (!isset($config['captiveportal'][$cpzone]['nomacfilter'])) { $rule_entry .= ",{$clientmac}"; } $_gb = @pfSense_ipfw_table("{$cpzone}_auth_up", IP_FW_TABLE_XADD, "{$rule_entry}", $bw_up_pipeno); - $_gb = @pfSense_ipfw_table("{$cpzone}_auth_down", IP_FW_TABLE_XADD, "{$rule_entry}", $bw_down_pipeno); if ($attributes['voucher']) { $attributes['session_timeout'] = $remaining_time; |
