diff options
| author | Luiz Souza <luiz@netgate.com> | 2017-09-22 08:52:49 -0500 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-09-22 08:52:49 -0500 |
| commit | bd068df3892cdd0fa98d7355f975e1d1ee81ea73 (patch) | |
| tree | 42c7663b673e387b0548785822249e5baa8f394f | |
| parent | aa61ecfde0952ed1c3a035ac9489f5a5f9c51425 (diff) | |
| download | pfsense-bd068df3892cdd0fa98d7355f975e1d1ee81ea73.zip pfsense-bd068df3892cdd0fa98d7355f975e1d1ee81ea73.tar.gz | |
Revert "Do not associate IP and MAC on down table. It should help #7813 and #7833"
This reverts commit aa61ecfde0952ed1c3a035ac9489f5a5f9c51425.
| -rw-r--r-- | src/etc/inc/captiveportal.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc index bcb3c75..81ce9e3 100644 --- a/src/etc/inc/captiveportal.inc +++ b/src/etc/inc/captiveportal.inc @@ -2304,13 +2304,11 @@ 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; |
