Changeset 266 for branches/stable


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/assign.html

    r158 r266  
    2929</td>
    3030</tr><tr class="color2">
    31 <td>Route/allocate from this master:&nbsp;</td><td>$$MASTERLIST$$</td>
     31<td>Route/allocate from this master:&nbsp;</td><td>$$MASTERLIST$$
     32Allow automatic allocation from private IP ranges:<input type=checkbox name=allowpriv>
     33</td>
    3234</tr><tr class="color1">
    3335<td>Circuit ID:&nbsp;</td><td><input name=circid size=40></td>
  • branches/stable/cgi-bin/main.cgi

    r265 r266  
    895895        } else {
    896896          $sql = "select * from freeblocks where maskbits<=$webvar{maskbits} and routed='n'".
     897                ($webvar{allowpriv} eq 'on' ? '' :
     898                " and not (cidr <<= '192.168.0.0/16'".
     899                        " or cidr <<= '10.0.0.0/8'".
     900                        " or cidr <<= '172.16.0.0/12')").
    897901                " order by maskbits desc";
    898902        }
Note: See TracChangeset for help on using the changeset viewer.