Project

General

Profile

« Previous | Next » 

Revision 0cd7c91a

Added by Renato Botelho almost 11 years ago

Subnet parameter is mandatory for pfSense_ipfw_Tableaction(), add where it's missing

View differences:

etc/inc/captiveportal.inc
710 710 
						$cpentry[2], // clientip
711 711 
						$cpentry[3], // clientmac
712 712 
						10); // NAS Request
713 
					$_gb = @pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XZEROENTRY, 1, $cpentry[2], $cpentry[3]);
714 
					$_gb = @pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XZEROENTRY, 2, $cpentry[2], $cpentry[3]);
713 
					$clientsn = (is_ipaddrv6($cpentry[2])) ? 128 : 32;
714 
					$_gb = @pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XZEROENTRY, 1, $cpentry[2], $clientsn, $cpentry[3]);
715 
					$_gb = @pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XZEROENTRY, 2, $cpentry[2], $clientsn, $cpentry[3]);
715 716 
					RADIUS_ACCOUNTING_START($cpentry[1], // ruleno
716 717 
						$cpentry[4], // username
717 718 
						$cpentry[5], // sessionid
......
857 858
858 859 
	if (is_ipaddr($dbent[2])) {
859 860 
		/* Delete client's ip entry from tables 1 and 2. */
860 
		$_gb = @pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 1, $dbent[2], $dbent[3]);
861 
		$_gb = @pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 2, $dbent[2], $dbent[3]);
861 
		$clientsn = (is_ipaddrv6($dbent[2])) ? 128 : 32;
862 
		pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 1, $dbent[2], $clientsn, $dbent[3]);
863 
		pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 2, $dbent[2], $clientsn, $dbent[3]);
862 864 
		/* XXX: Redundant?! Ensure all pf(4) states are killed. */
863 865 
		$_gb = @pfSense_kill_states($dbent[2]);
864 866 
		$_gb = @pfSense_kill_srcstates($dbent[2]);

Also available in: Unified diff