modules/admin-full: make menus work with no dnsmasq or firewall installed

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index fdff48d..ad4ca93 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -20,6 +20,9 @@ local fw = require "luci.model.firewall"
 
 arg[1] = arg[1] or ""
 
 
 arg[1] = arg[1] or ""
 

+local has_dnsmasq  = fs.access("/etc/config/dhcp")
+local has_firewall = fs.access("/etc/config/firewall")
+

 local has_3g     = fs.access("/usr/bin/gcom")
 local has_pptp   = fs.access("/usr/sbin/pptp")
 local has_pppd   = fs.access("/usr/sbin/pppd")
 local has_3g     = fs.access("/usr/bin/gcom")
 local has_pptp   = fs.access("/usr/sbin/pptp")
 local has_pppd   = fs.access("/usr/sbin/pppd")


@@ -30,9 +33,12 @@ local has_6in4   = fs.access("/lib/network/6in4.sh")
 local has_6to4   = fs.access("/lib/network/6to4.sh")
 
 m = Map("network", translate("Interfaces") .. " - " .. arg[1]:upper(), translate("On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."))
 local has_6to4   = fs.access("/lib/network/6to4.sh")
 
 m = Map("network", translate("Interfaces") .. " - " .. arg[1]:upper(), translate("On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."))

-m:chain("firewall")

 m:chain("wireless")
 
 m:chain("wireless")
 

+if has_firewall then
+       m:chain("firewall")
+end
+

 nw.init(m.uci)
 fw.init(m.uci)
 
 nw.init(m.uci)
 fw.init(m.uci)
 


@@ -56,7 +62,7 @@ if has_pppd  then s:tab("ppp", translate("PPP Settings")) end
 if has_pppoa then s:tab("atm", translate("ATM Settings")) end
 if has_6in4 or has_6to4 then s:tab("tunnel", translate("Tunnel Settings")) end
 s:tab("physical", translate("Physical Settings"))
 if has_pppoa then s:tab("atm", translate("ATM Settings")) end
 if has_6in4 or has_6to4 then s:tab("tunnel", translate("Tunnel Settings")) end
 s:tab("physical", translate("Physical Settings"))

-s:tab("firewall", translate("Firewall Settings"))
+if has_firewall then s:tab("firewall", translate("Firewall Settings")) end

 
 st = s:taboption("general", DummyValue, "__status", translate("Status"))
 st.template = "admin_network/iface_status"
 
 st = s:taboption("general", DummyValue, "__status", translate("Status"))
 st.template = "admin_network/iface_status"


@@ -143,38 +149,38 @@ ifname_multi.cfgvalue = ifname_single.cfgvalue
 ifname_multi.write = ifname_single.write
 
 
 ifname_multi.write = ifname_single.write
 
 

-local fwd_to, fwd_from
+if has_firewall then
+       fwzone = s:taboption("firewall", Value, "_fwzone",
+               translate("Create / Assign firewall-zone"),
+               translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))

 
 

-fwzone = s:taboption("firewall", Value, "_fwzone",
-       translate("Create / Assign firewall-zone"),
-       translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
+       fwzone.template = "cbi/firewall_zonelist"
+       fwzone.network = arg[1]
+       fwzone.rmempty = false

 
 

-fwzone.template = "cbi/firewall_zonelist"
-fwzone.network = arg[1]
-fwzone.rmempty = false
+       function fwzone.cfgvalue(self, section)
+               self.iface = section
+               local z = fw:get_zone_by_network(section)
+               return z and z:name()
+       end

 
 

-function fwzone.cfgvalue(self, section)
-       self.iface = section
-       local z = fw:get_zone_by_network(section)
-       return z and z:name()
-end
+       function fwzone.write(self, section, value)
+               local zone = fw:get_zone(value)

 
 

-function fwzone.write(self, section, value)
-       local zone = fw:get_zone(value)
+               if not zone and value == '-' then
+                       value = m:formvalue(self:cbid(section) .. ".newzone")
+                       if value and #value > 0 then
+                               zone = fw:add_zone(value)
+                       else
+                               fw:del_network(section)
+                       end
+               end

 
 

-       if not zone and value == '-' then
-               value = m:formvalue(self:cbid(section) .. ".newzone")
-               if value and #value > 0 then
-                       zone = fw:add_zone(value)
-               else
+               if zone then

                        fw:del_network(section)
                        fw:del_network(section)

+                       zone:add_network(section)

                end
        end
                end
        end

-
-       if zone then
-               fw:del_network(section)
-               zone:add_network(section)
-       end

 end
 
 ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
 end
 
 ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))


@@ -507,89 +513,95 @@ dns.optional = true
 dns.datatype = "ip4addr"
 
 
 dns.datatype = "ip4addr"
 
 

-m2 = Map("dhcp", "", "")
-function m2.on_parse()
-       local has_section = false
+--
+-- Display DNS settings if dnsmasq is available
+--

 
 

-       m2.uci:foreach("dhcp", "dhcp", function(s)
-               if s.interface == arg[1] then
-                       has_section = true
-                       return false
-               end
-       end)
+if has_dnsmasq then
+       m2 = Map("dhcp", "", "")
+       function m2.on_parse()
+               local has_section = false

 
 

-       if not has_section then
-               m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" })
-               m2.uci:save("dhcp")
+               m2.uci:foreach("dhcp", "dhcp", function(s)
+                       if s.interface == arg[1] then
+                               has_section = true
+                               return false
+                       end
+               end)
+
+               if not has_section then
+                       m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" })
+                       m2.uci:save("dhcp")
+               end

        end
        end

-end

 
 

-s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
-s.addremove = false
-s.anonymous = true
-s:tab("general",  translate("General Setup"))
-s:tab("advanced", translate("Advanced Settings"))
+       s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
+       s.addremove = false
+       s.anonymous = true
+       s:tab("general",  translate("General Setup"))
+       s:tab("advanced", translate("Advanced Settings"))

 
 

-function s.filter(self, section)
-       return m2.uci:get("dhcp", section, "interface") == arg[1]
-end
+       function s.filter(self, section)
+               return m2.uci:get("dhcp", section, "interface") == arg[1]
+       end

 
 

-local ignore = s:taboption("general", Flag, "ignore",
-       translate("Ignore interface"),
-       translate("Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for " ..
-               "this interface."))
-
-ignore.rmempty = false
-
-local start = s:taboption("general", Value, "start", translate("Start"),
-       translate("Lowest leased address as offset from the network address."))
-start.optional = true
-start.datatype = "uinteger"
-start.default = "100"
-
-local limit = s:taboption("general", Value, "limit", translate("Limit"),
-       translate("Maximum number of leased addresses."))
-limit.optional = true
-limit.datatype = "uinteger"
-limit.default = "150"
-
-local ltime = s:taboption("general", Value, "leasetime", translate("Leasetime"),
-       translate("Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."))
-ltime.rmempty = true
-ltime.default = "12h"
-
-local dd = s:taboption("advanced", Flag, "dynamicdhcp",
-       translate("Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"),
-       translate("Dynamically allocate DHCP addresses for clients. If disabled, only " ..
-               "clients having static leases will be served."))
-
-dd.rmempty = false
-function dd.cfgvalue(self, section)
-       return Flag.cfgvalue(self, section) or "1"
-end
+       local ignore = s:taboption("general", Flag, "ignore",
+               translate("Ignore interface"),
+               translate("Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for " ..
+                       "this interface."))
+
+       ignore.rmempty = false
+
+       local start = s:taboption("general", Value, "start", translate("Start"),
+               translate("Lowest leased address as offset from the network address."))
+       start.optional = true
+       start.datatype = "uinteger"
+       start.default = "100"
+
+       local limit = s:taboption("general", Value, "limit", translate("Limit"),
+               translate("Maximum number of leased addresses."))
+       limit.optional = true
+       limit.datatype = "uinteger"
+       limit.default = "150"
+
+       local ltime = s:taboption("general", Value, "leasetime", translate("Leasetime"),
+               translate("Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."))
+       ltime.rmempty = true
+       ltime.default = "12h"
+
+       local dd = s:taboption("advanced", Flag, "dynamicdhcp",
+               translate("Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"),
+               translate("Dynamically allocate DHCP addresses for clients. If disabled, only " ..
+                       "clients having static leases will be served."))
+
+       dd.rmempty = false
+       function dd.cfgvalue(self, section)
+               return Flag.cfgvalue(self, section) or "1"
+       end

 
 

-s:taboption("advanced", Flag, "force", translate("Force"),
-       translate("Force DHCP on this network even if another server is detected."))
+       s:taboption("advanced", Flag, "force", translate("Force"),
+               translate("Force DHCP on this network even if another server is detected."))

 
 

--- XXX: is this actually useful?
---s:taboption("advanced", Value, "name", translate("Name"),
---     translate("Define a name for this network."))
+       -- XXX: is this actually useful?
+       --s:taboption("advanced", Value, "name", translate("Name"),
+       --      translate("Define a name for this network."))

 
 

-mask = s:taboption("advanced", Value, "netmask",
-       translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"),
-       translate("Override the netmask sent to clients. Normally it is calculated " ..
-               "from the subnet that is served."))
+       mask = s:taboption("advanced", Value, "netmask",
+               translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"),
+               translate("Override the netmask sent to clients. Normally it is calculated " ..
+                       "from the subnet that is served."))

 
 

-mask.optional = true
-mask.datatype = "ip4addr"
+       mask.optional = true
+       mask.datatype = "ip4addr"

 
 

-s:taboption("advanced", DynamicList, "dhcp_option", translate("DHCP-Options"),
-       translate("Define additional DHCP options, for example \"<code>6,192.168.2.1," ..
-               "192.168.2.2</code>\" which advertises different DNS servers to clients."))
+       s:taboption("advanced", DynamicList, "dhcp_option", translate("DHCP-Options"),
+               translate("Define additional DHCP options, for example \"<code>6,192.168.2.1," ..
+                       "192.168.2.2</code>\" which advertises different DNS servers to clients."))

 
 

-for i, n in ipairs(s.children) do
-       if n ~= ignore then
-               n:depends("ignore", "")
+       for i, n in ipairs(s.children) do
+               if n ~= ignore then
+                       n:depends("ignore", "")
+               end

        end
 end
 
        end
 end
 

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
index b4a442c..3d0d755 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
@@ -12,6 +12,7 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 
 $Id$
 ]]--
 

+local fs   = require "nixio.fs"

 local nw   = require "luci.model.network"
 local fw   = require "luci.model.firewall"
 local uci  = require "luci.model.uci".cursor()
 local nw   = require "luci.model.network"
 local fw   = require "luci.model.firewall"
 local uci  = require "luci.model.uci".cursor()


@@ -19,6 +20,8 @@ local http = require "luci.http"
 
 local iw = luci.sys.wifi.getiwinfo(http.formvalue("device"))
 
 
 local iw = luci.sys.wifi.getiwinfo(http.formvalue("device"))
 

+local has_firewall = fs.access("/etc/config/firewall")
+

 if not iw then
        luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
        return
 if not iw then
        luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
        return


@@ -89,25 +92,30 @@ newnet = m:field(Value, "_netname_new", translate("Name of the new network"),
 newnet.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wwan"
 newnet.datatype = "uciname"
 
 newnet.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wwan"
 newnet.datatype = "uciname"
 

-fwzone = m:field(Value, "_fwzone",
-       translate("Create / Assign firewall-zone"),
-       translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
+if has_firewall then
+       fwzone = m:field(Value, "_fwzone",
+               translate("Create / Assign firewall-zone"),
+               translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))

 
 

-fwzone.template = "cbi/firewall_zonelist"
-fwzone.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wan"
+       fwzone.template = "cbi/firewall_zonelist"
+       fwzone.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wan"
+end

 
 function newnet.parse(self, section)
        local net, zone
 
 function newnet.parse(self, section)
        local net, zone

-       local value = self:formvalue(section)
-       local zval  = fwzone:formvalue(section)

 
 

+       local value = self:formvalue(section)

        net = nw:add_network(value, { proto = "dhcp" })
        net = nw:add_network(value, { proto = "dhcp" })

-       zone = fw:get_zone(zval)

 
 

-       if not zone and zval == '-' then
-               zval = m:formvalue(fwzone:cbid(section) .. ".newzone")
-               if zval and #zval > 0 then
-                       zone = fw:add_zone(zval)
+       if has_firewall then
+               local zval  = fwzone:formvalue(section)
+               zone = fw:get_zone(zval)
+
+               if not zone and zval == '-' then
+                       zval = m:formvalue(fwzone:cbid(section) .. ".newzone")
+                       if zval and #zval > 0 then
+                               zone = fw:add_zone(zval)
+                       end

                end
        end
 
                end
        end
 


@@ -165,10 +173,12 @@ function newnet.parse(self, section)
        end
 end
 
        end
 end
 

-function fwzone.cfgvalue(self, section)
-       self.iface = section
-       local z = fw:get_zone_by_network(section)
-       return z and z:name()
+if has_firewall then
+       function fwzone.cfgvalue(self, section)
+               self.iface = section
+               local z = fw:get_zone_by_network(section)
+               return z and z:name()
+       end

 end
 
 return m
 end
 
 return m