Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix dmz_mode handling (#235)

This commit is contained in:
Tim Wilkinson 2022-02-27 15:57:51 -08:00 committed by GitHub
parent 70f81f5269
commit 301112fb37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
files/usr/local/bin/node-setup
View File

@ -43,7 +43,7 @@ require("aredn.hardware")
-- helpers start -- helpers start
function is_null(v) function is_null(v)
if not v or v == "" or v == 0 then if not v or v == "" or v == 0 or v == "0" then
return true return true
else else
return false return false
@ -124,7 +124,7 @@ if cfg.wan_proto == "dhcp" then
deleteme.wan_gw = true deleteme.wan_gw = true
deleteme.wan_mask = true deleteme.wan_mask = true
end end
if cfg.dmz_mode == "1" or cfg.wan_proto ~= "disabled" then if not is_null(cfg.dmz_mode) or cfg.wan_proto ~= "disabled" then
deleteme.lan_gw = true deleteme.lan_gw = true
end end
@ -163,7 +163,7 @@ end
-- sensible dmz_mode default -- sensible dmz_mode default
if is_null(cfg.dmz_mode) then if is_null(cfg.dmz_mode) then
cfg.dmz_mode = 0 cfg.dmz_mode = "0"
end end
-- switch to dmz values if needed -- switch to dmz values if needed
@ -180,7 +180,7 @@ local portfile = "/etc/config.mesh/_setup.ports"
local dhcpfile = "/etc/config.mesh/_setup.dhcp" local dhcpfile = "/etc/config.mesh/_setup.dhcp"
local aliasfile = "/etc/config.mesh/aliases" local aliasfile = "/etc/config.mesh/aliases"
local servfile = "/etc/config.mesh/_setup.services" local servfile = "/etc/config.mesh/_setup.services"
if cfg.dmz_mode == 0 then if is_null(cfg.dmz_mode) then
portfile = portfile .. ".nat" portfile = portfile .. ".nat"
dhcpfile = dhcpfile .. ".nat" dhcpfile = dhcpfile .. ".nat"
aliasfile = aliasfile .. ".nat" aliasfile = aliasfile .. ".nat"
@ -517,8 +517,8 @@ if not is_null(cfg.lan_dhcp_noroute) then
}) })
else else
c:set("dhcp", "@dhcp[0]", "dhcp_option", { c:set("dhcp", "@dhcp[0]", "dhcp_option", {
"121,10.0.0.0/8" .. cfg.lan_ip .. ",172.16.0.0/12," .. cfg.lan_ip .. ",0.0.0.0/0," .. cfg/lan_ip, "121,10.0.0.0/8" .. cfg.lan_ip .. ",172.16.0.0/12," .. cfg.lan_ip .. ",0.0.0.0/0," .. cfg.lan_ip,
"249,10.0.0.0/8" .. cfg.lan_ip .. ",172.16.0.0/12," .. cfg.lan_ip .. ",0.0.0.0/0," .. cfg/lan_ip "249,10.0.0.0/8" .. cfg.lan_ip .. ",172.16.0.0/12," .. cfg.lan_ip .. ",0.0.0.0/0," .. cfg.lan_ip
}) })
end end
c:commit("dhcp") c:commit("dhcp")