$Id$
]]--
-local nw = require "luci.model.network"
-local fw = require "luci.model.firewall"
-
-local has_ipv6 = nw:has_ipv6()
+local bridge = (arg[1] == "bridgelan")
+local niulib = require "luci.niulib"
+local fs = require "nixio.fs"
+local has_ipv6 = fs.access("/proc/net/ipv6_route")
+
+m = Map("network", translate("Configure Local Network"), bridge and
+translate([[The wireless network will be connected directly to your local network.
+Make sure you to assign any address to this device that is in the same subnet
+of the other devices in your network but that is not already occupied.
+If you have a DHCP-Server in this network you may also choose DHCP for address configuration.]])
+or translate("These settings affect the devices in your local network. "..
+"Usually you do not need to change anything here for this device to work correctly."))
+
+s = m:section(NamedSection, "lan", "interface", "Network Settings")
+s.addremove = false
-m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
-m:chain("firewall")
+s:tab("general", translate("General Settings"))
+s:tab("expert", translate("Expert Settings"))
-nw.init(m.uci)
-fw.init(m.uci)
+p = s:taboption("expert", ListValue, "proto", translate("Address Configuration"))
+p.default = "static"
+p:value("static", translate("Static Configuration"))
+p:value("dhcp", "DHCP")
-s = m:section(NamedSection, "lan", "interface")
-s.addremove = false
-s:tab("general", translate("niu_general", "General Settings"))
+ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+ipaddr.default = "192.168.0.1"
+ipaddr:depends("proto", "static")
-ipaddr = s:taboption("general", Value, "ipaddr", translate("ipaddress"))
-
-nm = s:taboption("general", Value, "netmask", translate("netmask"))
+nm = s:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+nm.default = "255.255.255.0"
nm:value("255.255.255.0")
nm:value("255.255.0.0")
nm:value("255.0.0.0")
+nm:depends("proto", "static")
-
-s:tab("expert", translate("niu_expert", "Expert Settings"))
-
-mac = s:taboption("expert", Value, "macaddr", translate("macaddress"))
+mac = s:taboption("expert", Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
mtu = s:taboption("expert", Value, "mtu", "MTU")
mtu.isinteger = true
-dns = s:taboption("expert", Value, "dns", translate("dnsserver"))
+dns = s:taboption("expert", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
dns:depends("peerdns", "")
-gw = s:taboption("expert", Value, "gateway", translate("gateway"))
-bcast = s:taboption("expert", Value, "bcast", translate("broadcast"))
+gw = s:taboption(bridge and "general" or "expert", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
+gw:depends("proto", "static")
+
+bcast = s:taboption("expert", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
+bcast:depends("proto", "static")
if has_ipv6 then
- ip6addr = s:taboption("expert", Value, "ip6addr", translate("ip6address"), translate("cidr6"))
- ip6gw = s:taboption("expert", Value, "ip6gw", translate("gateway6"))
+ ip6addr = s:taboption("expert", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
+ ip6addr:depends("proto", "static")
+ ip6gw = s:taboption("expert", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
+ ip6gw:depends("proto", "static")
end
+emerg = s:taboption("expert", Value, "_emergv4", translate("Emergency Access Address"),
+translate([[In case the DHCP request fails you will still be able to access this device using given IP
+by configuring your computer to an address in the same subnet and netmask 255.255.255.0.]]))
+emerg:depends("proto", "dhcp")
+emerg:value("", translate("disable"))
+emerg.default = "169.254.255.169"
-br = s:taboption("expert", Flag, "type", translate("a_n_i_bridge"), translate("a_n_i_bridge1"))
-br.enabled = "bridge"
-br.rmempty = true
-stp = s:taboption("expert", Flag, "stp", translate("a_n_i_stp"),
- translate("a_n_i_stp1", "Enables the Spanning Tree Protocol on this bridge"))
-stp:depends("type", "1")
-stp.rmempty = true
+stp = s:taboption("expert", Flag, "stp", translate("Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"),
+ translate("Enables the Spanning Tree Protocol on this bridge"))
-ifname_single = s:taboption("expert", Value, "ifname_single", translate("interface"))
-ifname_single.template = "cbi/network_ifacelist"
-ifname_single.widget = "radio"
-ifname_single.nobridges = true
-ifname_single.rmempty = true
-ifname_single:depends("type", "")
-
-function ifname_single.cfgvalue(self, s)
- return self.map.uci:get("network", s, "ifname")
+ifname_multi = s:taboption("expert", MultiValue, "ifname", translate("Interface"))
+ifname_multi.widget = "checkbox"
+for _, eth in ipairs(niulib.eth_get_available("lan")) do
+ ifname_multi:value(eth, translate("Ethernet-Adapter (%s)") % eth)
end
-function ifname_single.write(self, s, val)
- local n = nw:get_network(s)
- if n then n:ifname(val) end
-end
+m2 = Map("dhcp")
-ifname_multi = s:taboption("expert", MultiValue, "ifname_multi", translate("interface"))
-ifname_multi.template = "cbi/network_ifacelist"
-ifname_multi.nobridges = true
-ifname_multi.widget = "checkbox"
-ifname_multi:depends("type", "1")
-ifname_multi.cfgvalue = ifname_single.cfgvalue
-ifname_multi.write = ifname_single.write
-
-for _, d in ipairs(nw:get_interfaces()) do
- if not d:is_bridge() then
- ifname_single:value(d:name())
- ifname_multi:value(d:name())
- end
-end
+s = m2:section(TypedSection, "dhcp", "DHCP")
+s.anonymous = true
+s.addremove = false
+s.dynamic = false
+
+s:tab("general", translate("General Settings"))
+
+s:depends("interface", "lan")
+
+enable = s:taboption("general", ListValue, "ignore", translate("Automatic address assignment for network devices"),
+bridge and
+translate("Note: Be careful that you do not accidently two DHCP servers in the same network with overlapping address ranges.")
+or "")
+enable:value(0, translate("enable"), {["network.lan.proto"] = "static"})
+enable:value(1, translate("disable"))
+
+
+s:tab("expert", translate("Expert Settings"))
+start = s:taboption("expert", Value, "start", translate("First leased address"))
+start:depends("ignore", "0")
+start.default = "100"
+limit = s:taboption("expert", Value, "limit", translate("Number of leased addresses"), "")
+limit:depends("ignore", "0")
+limit.default = "150"
+time = s:taboption("expert", Value, "leasetime", translate("Lease Time"))
+time:depends("ignore", "0")
+time.default = "12h"
+local dd = s:taboption("expert", Flag, "dynamicdhcp", translate("Also generate addresses for unknown devices"))
+dd.rmempty = false
+dd.default = "1"
+dd:depends("ignore", "0")
-return m
+return m, m2
\ No newline at end of file
projects / project / luci.git / blobdiff