Changeset 266 for branches/stable

Timestamp:

07/15/05 16:39:54 (19 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Tweak "new assignment" defaults to avoid private networks if
a "master" is not chosen. Automatic assignment can still pick
a private block if the appropriate option is checked.

Location:

branches/stable

Files:

• assign.html (modified) (1 diff)
• cgi-bin/main.cgi (modified) (1 diff)

branches/stable/assign.html

@@ -29 +29 @@
 </td>
 </tr><tr class="color2">
-<td>Route/allocate from this master:&nbsp;</td><td>$$MASTERLIST$$</td>
+<td>Route/allocate from this master:&nbsp;</td><td>$$MASTERLIST$$
+Allow automatic allocation from private IP ranges:<input type=checkbox name=allowpriv>
+</td>
 </tr><tr class="color1">
 <td>Circuit ID:&nbsp;</td><td><input name=circid size=40></td>

branches/stable/cgi-bin/main.cgi

@@ -895 +895 @@
         } else {
           $sql = "select * from freeblocks where maskbits<=$webvar{maskbits} and routed='n'".
+                ($webvar{allowpriv} eq 'on' ? '' : 
+                " and not (cidr <<= '192.168.0.0/16'".
+                        " or cidr <<= '10.0.0.0/8'".
+                        " or cidr <<= '172.16.0.0/12')").
                 " order by maskbits desc";
         }