diff options
| author | bcyrill <cyrill@bannwart.info> | 2012-12-15 16:19:59 +0100 |
|---|---|---|
| committer | bcyrill <cyrill@bannwart.info> | 2012-12-15 16:19:59 +0100 |
| commit | 073f0ac4647fbcb99b82f5f40563fd2b8e874441 (patch) | |
| tree | e14ab8fd2e51a0894afca8e6d6319cbef85ef954 /etc | |
| parent | 4068dcac93e835ad72b67b0d149d1c41aaed4caa (diff) | |
| download | pfsense-073f0ac4647fbcb99b82f5f40563fd2b8e874441.zip pfsense-073f0ac4647fbcb99b82f5f40563fd2b8e874441.tar.gz | |
Fix action and table order in pfSense_ipfw_Tableaction calls
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 7b8154c..42b23c7 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -861,8 +861,8 @@ function captiveportal_disconnect($dbent, $radiusservers,$term_cause = 1,$stop_t if (is_ipaddr($dbent[2])) { captiveportal_ipfw_set_context($cpzone); /* Delete client's ip entry from tables 3 and 4. */ - pfSense_ipfw_Tableaction($cpzone, 1, IP_FW_TABLE_DEL, $dbent[2]); - pfSense_ipfw_Tableaction($cpzone, 2, IP_FW_TABLE_DEL, $dbent[2]); + pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 1, $dbent[2]); + pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 2, $dbent[2]); /* XXX: Redundant?! Ensure all pf(4) states are killed. */ pfSense_kill_states($dbent[2]); pfSense_kill_srcstates($dbent[2]); @@ -1843,14 +1843,14 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut captiveportal_ipfw_set_context($cpzone); if (!isset($config['captiveportal'][$cpzone]['nomacfilter'])) - pfSense_ipfw_Tableaction($cpzone, 1, IP_FW_TABLE_ADD, $clientip, 32, $clientmac, $bw_up_pipeno); + pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_ADD, 1, $clientip, 32, $clientmac, $bw_up_pipeno); else - pfSense_ipfw_Tableaction($cpzone, 1, IP_FW_TABLE_ADD, $clientip, 32, NULL, $bw_up_pipeno); + pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_ADD, 1, $clientip, 32, NULL, $bw_up_pipeno); if (!isset($config['captiveportal'][$cpzone]['nomacfilter'])) - pfSense_ipfw_Tableaction("", 2, IP_FW_TABLE_ADD, $clientip, 32, $clientmac, $bw_down_pipeno); + pfSense_ipfw_Tableaction("", IP_FW_TABLE_ADD, 2, $clientip, 32, $clientmac, $bw_down_pipeno); else - pfSense_ipfw_Tableaction("", 2, IP_FW_TABLE_ADD, $clientip, 32, NULL, $bw_down_pipeno); + pfSense_ipfw_Tableaction("", IP_FW_TABLE_ADD, 2, $clientip, 32, NULL, $bw_down_pipeno); if ($attributes['voucher']) $attributes['session_timeout'] = $remaining_time; |
