diff options
| author | Ermal <eri@pfsense.org> | 2011-11-02 14:59:12 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-11-02 14:59:12 +0000 |
| commit | a135349d62a1932cb1ab9c29436efcd8e8a383d5 (patch) | |
| tree | 2fe6bdf09e07ff9ca4e2747899a18c43c688666d | |
| parent | f6ee561edb89615910f316912ec033ab32e2960f (diff) | |
| download | pfsense-a135349d62a1932cb1ab9c29436efcd8e8a383d5.zip pfsense-a135349d62a1932cb1ab9c29436efcd8e8a383d5.tar.gz | |
Fixes #1976. Correct passthrough mac entries to not overwrite each other this is different from allowed ips that used tables.
| -rw-r--r-- | etc/inc/captiveportal.inc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 93f3642..b509444 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -884,10 +884,7 @@ function captiveportal_passthrumac_configure_entry($macent) { $actionup = "allow"; $actiondown = "allow"; - if ($enBwup && $enBwdown) - $ruleno = captiveportal_get_next_ipfw_ruleno(2000, 49899, true); - else - $ruleno = captiveportal_get_next_ipfw_ruleno(2000, 49899, false); + $ruleno = captiveportal_get_next_ipfw_ruleno(2000, 49899, true); if ($enBwup) { $bw_up = $ruleno + 20000; @@ -1369,7 +1366,7 @@ function captiveportal_get_ipfw_passthru_ruleno($value) { global $config, $g; if(!isset($config['captiveportal']['enable'])) - return NULL; + return NULL; $cpruleslck = lock('captiveportalrules', LOCK_EX); if (file_exists("{$g['vardb_path']}/captiveportal.rules")) { |
