Changeset 6396

Timestamp:

11/07/10 21:01:56 (3 years ago)

Author:

jow

Message:

applications/luci-firewall: support local destination in rules, add placeholders

Location:

luci/trunk/applications/luci-firewall/luasrc/model/cbi/luci_fw

Files:

• rrule.lua (modified) (3 diffs)
• trule.lua (modified) (5 diffs)

luci/trunk/applications/luci-firewall/luasrc/model/cbi/luci_fw/rrule.lua

@@ -93 +93 @@
         "the internal host"))
 toport.optional = true
-toport.size = 5
-
+toport.placeholder = "0-65535"
 
 target = s:taboption("advanced", ListValue, "target", translate("Redirection type"))
@@ -114 +113 @@
 src_dip.optional = true
 src_dip.datatype = "ip4addr"
+src_dip.placeholder = translate("any")
 
 src_mac = s:taboption("advanced", Value, "src_mac", translate("Source MAC address"))
 src_mac.optional = true
 src_mac.datatype = "macaddr"
+src_mac.placeholder = translate("any")
 
 src_ip = s:taboption("advanced", Value, "src_ip", translate("Source IP address"))
 src_ip.optional = true
 src_ip.datatype = "ip4addr"
+src_ip.placeholder = translate("any")
 
 sport = s:taboption("advanced", Value, "src_port", translate("Source port"),
@@ -128 +130 @@
 sport.optional = true
 sport.datatype = "portrange"
+sport.placeholder = "0-65536"
 sport:depends("proto", "tcp")
 sport:depends("proto", "udp")

luci/trunk/applications/luci-firewall/luasrc/model/cbi/luci_fw/trule.lua

@@ -54 +54 @@
 dest = s:taboption("advanced", Value, "dest", translate("Destination zone"))
 dest.nocreate = true
-dest.default = "lan"
+dest.allowlocal = true
 dest.template = "cbi/firewall_zonelist"
 
@@ -108 +108 @@
 src_ip.optional = true
 src_ip.datatype = has_v2 and "ipaddr" or "ip4addr"
+src_ip.placeholder = translate("any")
 
 sport = s:taboption("general", Value, "src_port", translate("Source port"))
 sport.optional = true
 sport.datatype = "portrange"
+sport.placeholder = "0-65535"
 sport:depends("proto", "tcp")
 sport:depends("proto", "udp")
@@ -119 +121 @@
 dest_ip.optional = true
 dest_ip.datatype = has_v2 and "ipaddr" or "ip4addr"
+dest_ip.placeholder = translate("any")
 
 dport = s:taboption("general", Value, "dest_port", translate("Destination port"))
@@ -126 +129 @@
 dport:depends("proto", "udp")
 dport:depends("proto", "tcpudp")
+dport.placeholder = "0-65535"
 
 jump = s:taboption("general", ListValue, "target", translate("Action"))
@@ -135 +139 @@
 
 
-s:taboption("advanced", Value, "src_mac", translate("Source MAC-address")).optional = true
+smac = s:taboption("advanced", Value, "src_mac", translate("Source MAC address"))
+smac.optional = true
+smac.datatype = "macaddr"
+smac.placeholder = translate("any")
 
 if has_v2 then