applications/luci-firewall: fix rule table formatting, add mac & ip hints to various...

[project/luci.git] / applications / luci-firewall / luasrc / model / cbi / firewall / rule-details.lua

diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
index 1f7df65..8a8ac32 100644 (file)
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
@@ -2,7 +2,7 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,13 +10,13 @@ You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
-$Id$
 ]]--
 
 local sys = require "luci.sys"
 local dsp = require "luci.dispatcher"
 local nxo = require "nixio"
 
+local ft = require "luci.tools.firewall"
 local nw = require "luci.model.network"
 local m, s, o, k, v
 
@@ -46,7 +46,7 @@ if not rule_type then
 --
 elseif rule_type == "redirect" then
 
-       local name = m:get(arg[1], "_name")
+       local name = m:get(arg[1], "name") or m:get(arg[1], "_name")
        if not name or #name == 0 then
                name = translate("(Unnamed SNAT)")
        else
@@ -76,9 +76,8 @@ elseif rule_type == "redirect" then
        s.addremove = false
 
 
-       o = s:option(Value, "_name", translate("Name"))
-       o.rmempty = true
-       o.size = 10
+       ft.opt_enabled(s, Button)
+       ft.opt_name(s, Value, translate("Name"))
 
 
        o = s:option(Value, "proto",
@@ -112,12 +111,20 @@ elseif rule_type == "redirect" then
        o.datatype = "neg(macaddr)"
        o.placeholder = translate("any")
 
+       luci.sys.net.mac_hints(function(mac, name)
+               o:value(mac, "%s (%s)" %{ mac, name })
+       end)
+
 
        o = s:option(Value, "src_ip", translate("Source IP address"))
        o.rmempty = true
-       o.datatype = "neg(ip4addr)"
+       o.datatype = "neg(ipaddr)"
        o.placeholder = translate("any")
 
+       luci.sys.net.ipv4_hints(function(ip, name)
+               o:value(ip, "%s (%s)" %{ ip, name })
+       end)
+
 
        o = s:option(Value, "src_port",
                translate("Source port"),
@@ -137,9 +144,9 @@ elseif rule_type == "redirect" then
        o = s:option(Value, "dest_ip", translate("Destination IP address"))
        o.datatype = "neg(ip4addr)"
 
-       for i, dataset in ipairs(luci.sys.net.arptable()) do
-               o:value(dataset["IP address"])
-       end
+       luci.sys.net.ipv4_hints(function(ip, name)
+               o:value(ip, "%s (%s)" %{ ip, name })
+       end)
 
 
        o = s:option(Value, "dest_port",
@@ -176,15 +183,29 @@ elseif rule_type == "redirect" then
        o.placeholder = translate('Do not rewrite')
 
 
+       s:option(Value, "extra",
+               translate("Extra arguments"),
+               translate("Passes additional arguments to iptables. Use with care!"))
+
+
 --
 -- Rule
 --
 else
+       local name = m:get(arg[1], "name") or m:get(arg[1], "_name")
+       if not name or #name == 0 then
+               name = translate("(Unnamed Rule)")
+       end
+
+       m.title = "%s - %s" %{ translate("Firewall - Traffic Rules"), name }
+
+
        s = m:section(NamedSection, arg[1], "rule", "")
        s.anonymous = true
        s.addremove = false
 
-       s:option(Value, "_name", translate("Name").." "..translate("(optional)"))
+       ft.opt_enabled(s, Button)
+       ft.opt_name(s, Value, translate("Name"))
 
 
        o = s:option(ListValue, "family", translate("Restrict to address family"))
@@ -261,14 +282,22 @@ else
        o.datatype = "list(macaddr)"
        o.placeholder = translate("any")
 
+       luci.sys.net.mac_hints(function(mac, name)
+               o:value(mac, "%s (%s)" %{ mac, name })
+       end)
+
 
        o = s:option(Value, "src_ip", translate("Source address"))
        o.datatype = "neg(ipaddr)"
        o.placeholder = translate("any")
 
+       luci.sys.net.ipv4_hints(function(ip, name)
+               o:value(ip, "%s (%s)" %{ ip, name })
+       end)
+
 
        o = s:option(Value, "src_port", translate("Source port"))
-       o.datatype = "list(neg,portrange)"
+       o.datatype = "list(neg(portrange))"
        o.placeholder = translate("any")
 
 
@@ -283,9 +312,13 @@ else
        o.datatype = "neg(ipaddr)"
        o.placeholder = translate("any")
 
+       luci.sys.net.ipv4_hints(function(ip, name)
+               o:value(ip, "%s (%s)" %{ ip, name })
+       end)
+
 
        o = s:option(Value, "dest_port", translate("Destination port"))
-       o.datatype = "list(neg,portrange)"
+       o.datatype = "list(neg(portrange))"
        o.placeholder = translate("any")
 
 
@@ -295,6 +328,11 @@ else
        o:value("ACCEPT", translate("accept"))
        o:value("REJECT", translate("reject"))
        o:value("NOTRACK", translate("don't track"))
+
+
+       s:option(Value, "extra",
+               translate("Extra arguments"),
+               translate("Passes additional arguments to iptables. Use with care!"))
 end
 
 return m