Project

General

Profile

« Previous | Next » 

Revision 5a0028ad

Added by Ermal Luçi over 10 years ago

Correct even other areas of CP using pfSense_ipfw_getTablestats function.

View differences:

usr/local/www/services_captiveportal_hostname.php
79 79 
				$ip = gethostbyname($ipent['hostname']);
80 80 
			$sn = (is_ipaddrv6($ip)) ? 128 : 32;
81 81 
			if(is_ipaddr($ip)) {
82 
				$ipfw = pfSense_ipfw_getTablestats($cpzoneid, 3, $ip);
82 
				$ipfw = pfSense_ipfw_getTablestats($cpzoneid, IP_FW_TABLE_XLISTENTRY, 3, $ip);
83 83 
				if (is_array($ipfw)) {
84 84 
					captiveportal_free_dn_ruleno($ipfw['dnpipe']);
85 85 
					pfSense_pipe_action("pipe delete {$ipfw['dnpipe']}");
usr/local/www/services_captiveportal_ip.php
73 73 
		if (isset($config['captiveportal'][$cpzone]['enable'])) {
74 74 
			$mask = (!empty($ipent['sn'])) ? $ipent['sn'] : 32;
75 75
76 
			$ipfw = pfSense_ipfw_getTablestats($cpzoneid, 3, $ipent['ip'], $mask);
76 
			$ipfw = pfSense_ipfw_getTablestats($cpzoneid, IP_FW_TABLE_XLISTENTRY, 3, $ipent['ip']);
77 77 
			pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 3, $ipent['ip'], $mask);
78 78 
			pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 4, $ipent['ip'], $mask);
79 79
usr/local/www/services_captiveportal_ip_edit.php
152 152 
			$cpzoneid = $a_cp[$cpzone]['zoneid'];
153 153 
			unset($ipfw);
154 154 
			if (isset($oldip) && isset($oldmask)) {
155 
				$ipfw = pfSense_ipfw_getTablestats($cpzoneid, 3, $oldip, $oldmask);
155 
				$ipfw = pfSense_ipfw_getTablestats($cpzoneid, IP_FW_TABLE_XLISTENTRY, 3, $oldip);
156 156 
				$rules .= "table 3 delete {$oldip}/{$oldmask}\n";
157 157 
				$rules .= "table 4 delete {$oldip}/{$oldmask}\n";
158 158 
				if (is_array($ipfw)) {

Also available in: Unified diff