Revision 073f0ac4
Added by Cyrill B over 12 years ago
| etc/inc/captiveportal.inc | ||
|---|---|---|
| 861 | 861 |
if (is_ipaddr($dbent[2])) {
|
| 862 | 862 |
captiveportal_ipfw_set_context($cpzone); |
| 863 | 863 |
/* Delete client's ip entry from tables 3 and 4. */ |
| 864 |
pfSense_ipfw_Tableaction($cpzone, 1, IP_FW_TABLE_DEL, $dbent[2]);
|
|
| 865 |
pfSense_ipfw_Tableaction($cpzone, 2, IP_FW_TABLE_DEL, $dbent[2]);
|
|
| 864 |
pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 1, $dbent[2]);
|
|
| 865 |
pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 2, $dbent[2]);
|
|
| 866 | 866 |
/* XXX: Redundant?! Ensure all pf(4) states are killed. */ |
| 867 | 867 |
pfSense_kill_states($dbent[2]); |
| 868 | 868 |
pfSense_kill_srcstates($dbent[2]); |
| ... | ... | |
| 1843 | 1843 |
|
| 1844 | 1844 |
captiveportal_ipfw_set_context($cpzone); |
| 1845 | 1845 |
if (!isset($config['captiveportal'][$cpzone]['nomacfilter'])) |
| 1846 |
pfSense_ipfw_Tableaction($cpzone, 1, IP_FW_TABLE_ADD, $clientip, 32, $clientmac, $bw_up_pipeno);
|
|
| 1846 |
pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_ADD, 1, $clientip, 32, $clientmac, $bw_up_pipeno);
|
|
| 1847 | 1847 |
else |
| 1848 |
pfSense_ipfw_Tableaction($cpzone, 1, IP_FW_TABLE_ADD, $clientip, 32, NULL, $bw_up_pipeno);
|
|
| 1848 |
pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_ADD, 1, $clientip, 32, NULL, $bw_up_pipeno);
|
|
| 1849 | 1849 |
|
| 1850 | 1850 |
if (!isset($config['captiveportal'][$cpzone]['nomacfilter'])) |
| 1851 |
pfSense_ipfw_Tableaction("", 2, IP_FW_TABLE_ADD, $clientip, 32, $clientmac, $bw_down_pipeno);
|
|
| 1851 |
pfSense_ipfw_Tableaction("", IP_FW_TABLE_ADD, 2, $clientip, 32, $clientmac, $bw_down_pipeno);
|
|
| 1852 | 1852 |
else |
| 1853 |
pfSense_ipfw_Tableaction("", 2, IP_FW_TABLE_ADD, $clientip, 32, NULL, $bw_down_pipeno);
|
|
| 1853 |
pfSense_ipfw_Tableaction("", IP_FW_TABLE_ADD, 2, $clientip, 32, NULL, $bw_down_pipeno);
|
|
| 1854 | 1854 |
|
| 1855 | 1855 |
if ($attributes['voucher']) |
| 1856 | 1856 |
$attributes['session_timeout'] = $remaining_time; |
Also available in: Unified diff
Fix action and table order in pfSense_ipfw_Tableaction calls