Merge branch 'DisableLANGW' into develop

This commit is contained in:
Conrad Lara - KG6JEI 2015-04-29 23:19:30 -07:00
commit cb3e1423b6
3 changed files with 29 additions and 3 deletions

View File

@ -503,13 +503,18 @@ if(wifi_useschains()){
$cmd .= "uci set wireless.\@wifi-device[0].rxantenna=$cfg{wifi_rxant} >/dev/null 2>&1;"; $cmd .= "uci set wireless.\@wifi-device[0].rxantenna=$cfg{wifi_rxant} >/dev/null 2>&1;";
$cmd .= "uci set wireless.\@wifi-device[0].txantenna=$cfg{wifi_txant} >/dev/null 2>&1;"; $cmd .= "uci set wireless.\@wifi-device[0].txantenna=$cfg{wifi_txant} >/dev/null 2>&1;";
} }
# Setup node lan dhcp
if ( $cfg{lan_dhcp_noroute} ) {
$cmd .= "uci add_list dhcp.\@dhcp[0].dhcp_option=3 >/dev/null 2>&1;"
}
# finish up
$cmd .= "uci -q commit;"; $cmd .= "uci -q commit;";
system $cmd; system $cmd;
# finish up
unless($auto) unless($auto)
{ {
print "configuration complete.\n"; print "configuration complete.\n";

View File

@ -682,6 +682,15 @@ if($dmz_mode)
print "<tr><td><nobr>DHCP End</nobr></td>"; print "<tr><td><nobr>DHCP End</nobr></td>";
#print "<td><input type=text size=4 name=dmz_dhcp_end value='$dmz_dhcp_end' disabled></td></tr>\n"; #print "<td><input type=text size=4 name=dmz_dhcp_end value='$dmz_dhcp_end' disabled></td></tr>\n";
print "<td>$dmz_dhcp_end</td></tr>\n"; print "<td>$dmz_dhcp_end</td></tr>\n";
print "<tr><td colspan=2><hr></hr></td></tr>";
print "<tr><th colspan=2>Advanced</th></tr>";
print "<tr><td>Disable<br>Default Route</td>";
print "<td><input type=checkbox name=lan_dhcp_noroute value=1";
print " checked" if $lan_dhcp_noroute;
print "></td></tr>\n";
push @hidden, "<input type=hidden name=dmz_dhcp_end value='$dmz_dhcp_end'>"; push @hidden, "<input type=hidden name=dmz_dhcp_end value='$dmz_dhcp_end'>";
push @hidden, "<input type=hidden name=dmz_dhcp_limit value='$dmz_dhcp_limit'>"; push @hidden, "<input type=hidden name=dmz_dhcp_limit value='$dmz_dhcp_limit'>";

View File

@ -297,6 +297,18 @@ The <strong>LAN</strong> box allows you to set the LAN IP Address
of the node and the address range of the DHCP server, and these should be of the node and the address range of the DHCP server, and these should be
self explanatory. The <b>LAN Mode</b> is described in the next section. self explanatory. The <b>LAN Mode</b> is described in the next section.
<br><br>
The <strong>Disable Default Route</strong> checkbox will cause the node to not
advertise that it should be chosen as the default route. This means that
computers plugged into the node will not try and route to the internet or
other networks via the mesh node and will only try and use the mesh node for
the 10.0.0.0/8 and 172.16.0.0/12 "mesh" network ranges. You will not be able
to access the internet, even if your node has internet available on its wan
port with this setting checked. This also applies to internet available over
the mesh. Use this only if you know what a default route is and you need to
be connected to two networks at once such as wired to the mesh, and WiFi to
a local served agency network.
<!-- <!--
, but the <strong>Mesh Bridge</strong> function will be described , but the <strong>Mesh Bridge</strong> function will be described
here. Given that AREDN&trade; is not restricted to the standard channels of the here. Given that AREDN&trade; is not restricted to the standard channels of the