Project

General

Profile

« Previous | Next » 

Revision bd068df3

Added by Luiz Souza almost 8 years ago

Revert "Do not associate IP and MAC on down table. It should help #7813 and #7833"

This reverts commit aa61ecfde0952ed1c3a035ac9489f5a5f9c51425.

View differences:

src/etc/inc/captiveportal.inc
2304 2304
			$_gb = @pfSense_ipfw_pipe("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100 buckets 16");
2305 2305

  
2306 2306
			$rule_entry = "{$clientip}/" . (is_ipaddrv6($clientip) ? "128" : "32");
2307
			$_gb = @pfSense_ipfw_table("{$cpzone}_auth_down", IP_FW_TABLE_XADD, "{$rule_entry}", $bw_down_pipeno);
2308

  
2309
			/* Add MAC address on UP rule only */
2310 2307
			if (!isset($config['captiveportal'][$cpzone]['nomacfilter'])) {
2311 2308
				$rule_entry .= ",{$clientmac}";
2312 2309
			}
2313 2310
			$_gb = @pfSense_ipfw_table("{$cpzone}_auth_up", IP_FW_TABLE_XADD, "{$rule_entry}", $bw_up_pipeno);
2311
			$_gb = @pfSense_ipfw_table("{$cpzone}_auth_down", IP_FW_TABLE_XADD, "{$rule_entry}", $bw_down_pipeno);
2314 2312

  
2315 2313
			if ($attributes['voucher']) {
2316 2314
				$attributes['session_timeout'] = $remaining_time;

Also available in: Unified diff