Free ipfw ruleno so it can be reused. Propperly delete passthrough mac entries that are not used.

1 files changed, 8 insertions, 0 deletions

diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php
index 7d5494e..80bbc3f 100755
--- a/usr/local/captiveportal/index.php
+++ b/usr/local/captiveportal/index.php
@@ -296,6 +296,14 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
 				if ($_POST['replacemacpassthru']) {
 					foreach ($config['captiveportal']['passthrumac'] as $idx => $macent) {
 						if ($macent['mac'] == $mac['mac']) {
+							$macrules = "";
+							$ruleno = captiveportal_get_ipfw_passthru_ruleno($mac['mac']);
+                                			if ($ruleno) {
+								captiveportal_free_ipfw_ruleno($ruleno, true);
+                                        			$macrules .= "delete {$ruleno}";
+								++$ruleno;
+                                        			$macrules .= "delete {$ruleno}";
+                                			}
 							unset($config['captiveportal']['passthrumac'][$idx]);
 							$mac['mac'] = $clientmac;
 							$config['captiveportal']['passthrumac'][] = $mac;