X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fifaces.lua;h=cf76c8617cc01a171fac8ef78d287234d9230842;hp=753779925b2c1051486775738402fb10bff76150;hb=a3850aa3c7ffbee487cfc9a7903b0561e532f335;hpb=cd63354f7e0eb7bac4416cbb90ae70f43b4c4194 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 753779925..cf76c8617 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -14,11 +14,16 @@ $Id$ ]]-- local fs = require "nixio.fs" +local ut = require "luci.util" local nw = require "luci.model.network" local fw = require "luci.model.firewall" arg[1] = arg[1] or "" +local has_dnsmasq = fs.access("/etc/config/dhcp") +local has_firewall = fs.access("/etc/config/firewall") +local has_radvd = fs.access("/etc/config/radvd") + local has_3g = fs.access("/usr/bin/gcom") local has_pptp = fs.access("/usr/sbin/pptp") local has_pppd = fs.access("/usr/sbin/pppd") @@ -26,14 +31,34 @@ local has_pppoe = fs.glob("/usr/lib/pppd/*/rp-pppoe.so")() local has_pppoa = fs.glob("/usr/lib/pppd/*/pppoatm.so")() local has_ipv6 = fs.access("/proc/net/ipv6_route") local has_6in4 = fs.access("/lib/network/6in4.sh") +local has_6to4 = fs.access("/lib/network/6to4.sh") +local has_relay = fs.access("/lib/network/relay.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 VLAN notation INTERFACE.VLANNR (e.g.: eth0.1).")) -m:chain("firewall") m:chain("wireless") +if has_firewall then + m:chain("firewall") +end + +if has_radvd then + m:chain("radvd") +end + nw.init(m.uci) fw.init(m.uci) + +local net = nw:get_network(arg[1]) + +-- redirect to overview page if network does not exist anymore (e.g. after a revert) +if not net then + luci.http.redirect(luci.dispatcher.build_url("admin/network/network")) + return +end + +local ifc = net:get_interfaces()[1] + s = m:section(NamedSection, arg[1], "interface", translate("Common Configuration")) s.addremove = false @@ -41,9 +66,14 @@ s:tab("general", translate("General Setup")) if has_ipv6 then s:tab("ipv6", translate("IPv6 Setup")) end 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 then s:tab("tunnel", translate("Tunnel Settings")) end +if has_6in4 or has_6to4 then s:tab("tunnel", translate("Tunnel Settings")) end +if has_relay then s:tab("relay", translate("Relay 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.network = arg[1] --[[ back = s:taboption("general", DummyValue, "_overview", translate("Overview")) @@ -62,6 +92,8 @@ if has_pppoa then p:value("pppoa", "PPPoA") end if has_3g then p:value("3g", "UMTS/3G") end if has_pptp then p:value("pptp", "PPTP") end if has_6in4 then p:value("6in4", "6in4") end +if has_6to4 then p:value("6to4", "6to4") end +if has_relay then p:value("relay", "Relay") end p:value("none", translate("none")) if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then @@ -77,7 +109,7 @@ br:depends("proto", "none") stp = s:taboption("physical", Flag, "stp", translate("Enable STP"), translate("Enables the Spanning Tree Protocol on this bridge")) -stp:depends("type", "1") +stp:depends("type", "bridge") stp.rmempty = true ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface")) @@ -103,70 +135,69 @@ function ifname_single.write(self, s, val) for _, i in ipairs(n:get_interfaces()) do n:del_interface(i) end - n:add_interface(val) + + for i in ut.imatch(val) do + n:add_interface(i) + + -- if this is not a bridge, only assign first interface + if self.option == "ifname_single" then + break + end + end end end - -ifname_multi = s:taboption("physical", MultiValue, "ifname_multi", translate("Interface")) +ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface")) ifname_multi.template = "cbi/network_ifacelist" ifname_multi.nobridges = true ifname_multi.network = arg[1] ifname_multi.widget = "checkbox" -ifname_multi:depends("type", "1") +ifname_multi:depends("type", "bridge") 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 - +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 unspecified to remove the interface from the associated zone or fill out the create field to define a new zone and attach the interface to it.")) -local fwd_to, fwd_from + fwzone.template = "cbi/firewall_zonelist" + fwzone.network = arg[1] + fwzone.rmempty = false -fwzone = s:taboption("firewall", Value, "_fwzone", - translate("Create / Assign firewall-zone"), - translate("Choose the firewall zone you want to assign to this interface. Select unspecified to remove the interface from the associated zone or fill out the create field to define a new zone and attach the interface to it.")) - -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) + zone:add_network(section) end end - - if zone then - fw:del_network(section) - zone:add_network(section) - end end ipaddr = s:taboption("general", Value, "ipaddr", translate("IPv4-Address")) -ipaddr.rmempty = true +ipaddr.optional = true ipaddr.datatype = "ip4addr" ipaddr:depends("proto", "static") nm = s:taboption("general", Value, "netmask", translate("IPv4-Netmask")) -nm.rmempty = true +nm.optional = true nm.datatype = "ip4addr" nm:depends("proto", "static") nm:value("255.255.255.0") @@ -178,14 +209,14 @@ gw.optional = true gw.datatype = "ip4addr" gw:depends("proto", "static") -bcast = s:taboption("general", Value, "bcast", translate("IPv4-Broadcast")) +bcast = s:taboption("general", Value, "broadcast", translate("IPv4-Broadcast")) bcast.optional = true bcast.datatype = "ip4addr" bcast:depends("proto", "static") if has_ipv6 then ip6addr = s:taboption("ipv6", Value, "ip6addr", translate("IPv6-Address"), translate("CIDR-Notation: address/prefix")) - ip6addr.rmempty = true + ip6addr.optional = true ip6addr.datatype = "ip6addr" ip6addr:depends("proto", "static") ip6addr:depends("proto", "6in4") @@ -194,42 +225,106 @@ if has_ipv6 then ip6gw.optional = true ip6gw.datatype = "ip6addr" ip6gw:depends("proto", "static") + + + ra = s:taboption("ipv6", Flag, "accept_ra", translate("Accept Router Advertisements")) + ra.default = m.uci:get("network", arg[1], "proto") == "dhcp" and ra.enabled or ra.disabled + ra:depends("proto", "static") + ra:depends("proto", "dhcp") + ra:depends("proto", "none") + + rs = s:taboption("ipv6", Flag, "send_rs", translate("Send Router Solicitiations")) + rs.default = m.uci:get("network", arg[1], "proto") ~= "dhcp" and rs.enabled or rs.disabled + rs:depends("proto", "static") + rs:depends("proto", "dhcp") + rs:depends("proto", "none") end -dns = s:taboption("general", Value, "dns", translate("DNS-Server"), - translate("You can specify multiple DNS servers separated by space here. Servers entered here will override " .. +dns = s:taboption("general", DynamicList, "dns", translate("DNS-Server"), + translate("You can specify multiple DNS servers here, press enter to add a new entry. Servers entered here will override " .. "automatically assigned ones.")) dns.optional = true +dns.cast = "string" dns.datatype = "ipaddr" -dns:depends("peerdns", "") +dns:depends({ peerdns = "", proto = "static" }) +dns:depends({ peerdns = "", proto = "dhcp" }) +dns:depends({ peerdns = "", proto = "pppoe" }) +dns:depends({ peerdns = "", proto = "pppoa" }) +dns:depends({ peerdns = "", proto = "none" }) mtu = s:taboption("physical", Value, "mtu", "MTU") mtu.optional = true mtu.datatype = "uinteger" +mtu.placeholder = 1500 +mtu:depends("proto", "static") +mtu:depends("proto", "dhcp") +mtu:depends("proto", "pppoe") +mtu:depends("proto", "pppoa") +mtu:depends("proto", "6in4") +mtu:depends("proto", "6to4") +mtu:depends("proto", "none") srv = s:taboption("general", Value, "server", translate("PPTP-Server")) srv:depends("proto", "pptp") srv.optional = false -srv.datatype = "ip4addr" +srv.datatype = "host" if has_6in4 then peer = s:taboption("general", Value, "peeraddr", translate("Server IPv4-Address")) peer.optional = false peer.datatype = "ip4addr" peer:depends("proto", "6in4") +end +if has_6in4 or has_6to4 then ttl = s:taboption("physical", Value, "ttl", translate("TTL")) ttl.default = "64" ttl.optional = true ttl.datatype = "uinteger" ttl:depends("proto", "6in4") + ttl:depends("proto", "6to4") +end + +if has_6to4 then + advi = s:taboption("general", Value, "adv_interface", translate("Advertise IPv6 on network")) + advi.widget = "checkbox" + advi.exclude = arg[1] + advi.default = "lan" + advi.template = "cbi/network_netlist" + advi.nocreate = true + advi.nobridges = true + advi:depends("proto", "6to4") + + advn = s:taboption("general", Value, "adv_subnet", translate("Advertised network ID"), translate("Allowed range is 1 to FFFF")) + advn.default = "1" + advn:depends("proto", "6to4") + + function advn.write(self, section, value) + value = tonumber(value, 16) or 1 + + if value > 65535 then value = 65535 + elseif value < 1 then value = 1 end + + Value.write(self, section, "%X" % value) + end +end + +if has_relay then + rnet = s:taboption("general", Value, "network", translate("Relay between networks")) + rnet.widget = "checkbox" + rnet.exclude = arg[1] + rnet.template = "cbi/network_netlist" + rnet.nocreate = true + rnet.nobridges = true + rnet:depends("proto", "relay") end mac = s:taboption("physical", Value, "macaddr", translate("MAC-Address")) mac:depends("proto", "none") mac:depends("proto", "static") mac:depends("proto", "dhcp") +mac.placeholder = ifc and ifc:mac():upper() if has_3g then service = s:taboption("general", ListValue, "service", translate("Service type")) @@ -341,10 +436,7 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then defaultroute:depends("proto", "pppoe") defaultroute:depends("proto", "pptp") defaultroute:depends("proto", "3g") - defaultroute.rmempty = false - function defaultroute.cfgvalue(...) - return ( AbstractValue.cfgvalue(...) or '1' ) - end + defaultroute.default = defaultroute.enabled peerdns = s:taboption("ppp", Flag, "peerdns", translate("Use peer DNS"), @@ -355,10 +447,7 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then peerdns:depends("proto", "pppoe") peerdns:depends("proto", "pptp") peerdns:depends("proto", "3g") - peerdns.rmempty = false - function peerdns.cfgvalue(...) - return ( AbstractValue.cfgvalue(...) or '1' ) - end + peerdns.default = peerdns.enabled if has_ipv6 then ipv6 = s:taboption("ppp", Flag, "ipv6", translate("Enable IPv6 on PPP link") ) @@ -409,136 +498,184 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then maxwait.datatype = "uinteger" end -s2 = m:section(TypedSection, "alias", translate("IP-Aliases")) -s2.addremove = true - -s2:depends("interface", arg[1]) -s2.defaults.interface = arg[1] +if has_relay then + fb = s:taboption("relay", Flag, "forward_bcast", translate("Forward broadcasts")) + fb.default = fb.enabled + fb:depends("proto", "relay") + + fd = s:taboption("relay", Flag, "forward_dhcp", translate("Forward DHCP")) + fd.default = fd.enabled + fd:depends("proto", "relay") + + gw = s:taboption("relay", Value, "relay_gateway", translate("Override Gateway")) + gw.optional = true + gw.placeholder = "0.0.0.0" + gw.datatype = "ip4addr" + gw:depends("proto", "relay") + function gw.cfgvalue(self, section) + return m.uci:get("network", section, "gateway") + end + function gw.write(self, section, value) + return m.uci:set("network", section, "gateway", value) + end + function gw.delete(self, section) + return m.uci:delete("network", section, "gateway") + end -s2:tab("general", translate("General Setup")) -s2.defaults.proto = "static" + expiry = s:taboption("relay", Value, "expiry", translate("Host expiry timeout")) + expiry.optional = true + expiry.placeholder = 30 + expiry.datatype = "uinteger" + expiry:depends("proto", "relay") + + retry = s:taboption("relay", Value, "retry", translate("ARP ping retries")) + retry.optional = true + retry.placeholder = 5 + retry.datatype = "uinteger" + retry:depends("proto", "relay") + + table = s:taboption("relay", Value, "table", translate("Routing table ID")) + table.optional = true + table.placeholder = 16800 + table.datatype = "uinteger" + table:depends("proto", "relay") +end -ip = s2:taboption("general", Value, "ipaddr", translate("IPv4-Address")) -ip.optional = true -ip.datatype = "ip4addr" -nm = s2:taboption("general", Value, "netmask", translate("IPv4-Netmask")) -nm.optional = true -nm.datatype = "ip4addr" -nm:value("255.255.255.0") -nm:value("255.255.0.0") -nm:value("255.0.0.0") +if net:proto() ~= "relay" then + s2 = m:section(TypedSection, "alias", translate("IP-Aliases")) + s2.addremove = true -gw = s2:taboption("general", Value, "gateway", translate("IPv4-Gateway")) -gw.optional = true -gw.datatype = "ip4addr" + s2:depends("interface", arg[1]) + s2.defaults.interface = arg[1] -if has_ipv6 then - s2:tab("ipv6", translate("IPv6 Setup")) + s2:tab("general", translate("General Setup")) + s2.defaults.proto = "static" - ip6 = s2:taboption("ipv6", Value, "ip6addr", translate("IPv6-Address"), translate("CIDR-Notation: address/prefix")) - ip6.optional = true - ip6.datatype = "ip6addr" + ip = s2:taboption("general", Value, "ipaddr", translate("IPv4-Address")) + ip.optional = true + ip.datatype = "ip4addr" - gw6 = s2:taboption("ipv6", Value, "ip6gw", translate("IPv6-Gateway")) - gw6.optional = true - gw6.datatype = "ip6addr" -end + nm = s2:taboption("general", Value, "netmask", translate("IPv4-Netmask")) + nm.optional = true + nm.datatype = "ip4addr" + nm:value("255.255.255.0") + nm:value("255.255.0.0") + nm:value("255.0.0.0") -s2:tab("advanced", translate("Advanced Settings")) + gw = s2:taboption("general", Value, "gateway", translate("IPv4-Gateway")) + gw.optional = true + gw.datatype = "ip4addr" -bcast = s2:taboption("advanced", Value, "bcast", translate("IPv4-Broadcast")) -bcast.optional = true -bcast.datatype = "ip4addr" + if has_ipv6 then + s2:tab("ipv6", translate("IPv6 Setup")) -dns = s2:taboption("advanced", Value, "dns", translate("DNS-Server")) -dns.optional = true -dns.datatype = "ip4addr" + ip6 = s2:taboption("ipv6", Value, "ip6addr", translate("IPv6-Address"), translate("CIDR-Notation: address/prefix")) + ip6.optional = true + ip6.datatype = "ip6addr" + gw6 = s2:taboption("ipv6", Value, "ip6gw", translate("IPv6-Gateway")) + gw6.optional = true + gw6.datatype = "ip6addr" + end -m2 = Map("dhcp", "", "") -function m2.on_parse() - local has_section = false + s2:tab("advanced", translate("Advanced Settings")) - m2.uci:foreach("dhcp", "dhcp", function(s) - if s.interface == arg[1] then - has_section = true - return false - end - end) + bcast = s2:taboption("advanced", Value, "bcast", translate("IPv4-Broadcast")) + bcast.optional = true + bcast.datatype = "ip4addr" - if not has_section then - m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" }) - m2.uci:save("dhcp") - end + dns = s2:taboption("advanced", Value, "dns", translate("DNS-Server")) + dns.optional = true + dns.datatype = "ip4addr" 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")) - -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 DHCP 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 (2m).")) -ltime.rmempty = true -ltime.default = "12h" - -local dd = s:taboption("advanced", Flag, "dynamicdhcp", - translate("Dynamic DHCP"), - 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 +-- +-- Display DNS settings if dnsmasq is available +-- -s:taboption("advanced", Flag, "force", translate("Force"), - translate("Force DHCP on this network even if another server is detected.")) +if has_dnsmasq and net:proto() == "static" then + m2 = Map("dhcp", "", "") + function m2.on_parse() + local has_section = false --- XXX: is this actually useful? ---s:taboption("advanced", Value, "name", translate("Name"), --- translate("Define a name for this network.")) + m2.uci:foreach("dhcp", "dhcp", function(s) + if s.interface == arg[1] then + has_section = true + return false + end + end) -mask = s:taboption("advanced", Value, "netmask", - translate("IPv4-Netmask"), - translate("Override the netmask sent to clients. Normally it is calculated " .. - "from the subnet that is served.")) + if not has_section then + m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" }) + m2.uci:save("dhcp") + end + end -mask.optional = true -mask.datatype = "ip4addr" + 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:taboption("advanced", DynamicList, "dhcp_option", translate("DHCP-Options"), - translate("Define additional DHCP options, for example \"6,192.168.2.1," .. - "192.168.2.2\" which advertises different DNS servers to clients.")) + function s.filter(self, section) + return m2.uci:get("dhcp", section, "interface") == arg[1] + end -for i, n in ipairs(s.children) do - if n ~= ignore then - n:depends("ignore", "") + local ignore = s:taboption("general", Flag, "ignore", + translate("Ignore interface"), + translate("Disable DHCP 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 (2m).")) + ltime.rmempty = true + ltime.default = "12h" + + local dd = s:taboption("advanced", Flag, "dynamicdhcp", + translate("Dynamic DHCP"), + translate("Dynamically allocate DHCP addresses for clients. If disabled, only " .. + "clients having static leases will be served.")) + dd.default = dd.enabled + + 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.")) + + mask = s:taboption("advanced", Value, "netmask", + translate("IPv4-Netmask"), + translate("Override the netmask sent to clients. Normally it is calculated " .. + "from the subnet that is served.")) + + mask.optional = true + mask.datatype = "ip4addr" + + s:taboption("advanced", DynamicList, "dhcp_option", translate("DHCP-Options"), + translate("Define additional DHCP options, for example \"6,192.168.2.1," .. + "192.168.2.2\" which advertises different DNS servers to clients.")) + + for i, n in ipairs(s.children) do + if n ~= ignore then + n:depends("ignore", "") + end end end