Change captiveportal_get_next_ipfw_ruleno function to adapt dynamically to the firewa...

git-svn-id: https://svn.m0n0.ch/wall/trunk@118 e36fee2c-cc09-0410-a7cc-ebac5c6737de

diff --git a/phpconf/inc/captiveportal.inc b/phpconf/inc/captiveportal.inc
index a7d2ae1201ddbdd4ca14769f063406adb6b2b5cf..70acace967338b2c33ba8dad88fb5925e44a785a 100644 (file)
--- a/phpconf/inc/captiveportal.inc
+++ b/phpconf/inc/captiveportal.inc
@@ -892,15 +892,15 @@ function captiveportal_write_elements() {
  *
  */
 
-function captiveportal_get_next_ipfw_ruleno() {
+function captiveportal_get_next_ipfw_ruleno($rulenos_start = 10000) {
 
     exec("/sbin/ipfw show", $fwrules);
     foreach ($fwrules as $fwrule) {
         preg_match("/^(\d+)\s+/", $fwrule, $matches);
         $rulenos_used[] = $matches[1];
     }
-    $rulenos_pool = range(10000, 19899);
     $rulenos_used = array_unique($rulenos_used);
+    $rulenos_pool = range($rulenos_start, ($rulenos_start + count($rulenos_used)));
     $rulenos_free = array_diff($rulenos_pool, $rulenos_used);
     $ruleno = array_shift($rulenos_free);
 

diff --git a/webgui/license.php b/webgui/license.php
index b7626b59c0b5c6106d4fab538e2c4359e7240940..bd06ca2c5ed998dbecbba32fa75432d8b287a010 100755 (executable)
--- a/webgui/license.php
+++ b/webgui/license.php
@@ -166,8 +166,8 @@ require("guiconfig.inc");
               &nbsp;&nbsp;&nbsp;&nbsp;<em><font color="#666666">Webgui users/groups</font></em><br>
                          <br>
               Jonathan De Graeve (<a href="mailto:Jonathan.De.Graeve@imelda.be">Jonathan.De.Graeve@imelda.be</a>)<br>
-              &nbsp;&nbsp;&nbsp;&nbsp;<em><font color="#666666">Complete captive portal RADIUS overhaul, cleanup</font></em></p>
-              &nbsp;&nbsp;&nbsp;&nbsp;<em><font color="#666666">captive portal: file manager, volume stats, FW rulepool (virtual port pool)</font></em></p>
+              &nbsp;&nbsp;&nbsp;&nbsp;<em><font color="#666666">Complete captive portal RADIUS overhaul, cleanup</font></em><br>
+              &nbsp;&nbsp;&nbsp;&nbsp;<em><font color="#666666">captive portal: file manager, volume stats, FW rulepool (virtual port pool)</font></em><br>
             <hr size="1">
             <p>m0n0wall is based upon/includes various free software packages, 
               listed below.<br>