Changeset 8154

Timestamp:

01/07/12 22:55:52 (17 months ago)

Author:

jow

Message:

applications/luci-firewall: fix datatype validation for masq src/dest; allow list of negated ucinames, hostnames, ip-ranges or -addresses

Files:

• luci/trunk/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua (modified) (3 diffs)

luci/trunk/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua

@@ -3 +3 @@
 
 Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -137 +138 @@
 
 msrc.optional = true
-msrc.datatype = "neg_network_ip4addr"
+msrc.datatype = "list(neg,network)"
 msrc.placeholder = "0.0.0.0/0"
 msrc:depends("family", "")
@@ -146 +147 @@
 
 mdest.optional = true
-mdest.datatype = "neg_network_ip4addr"
+mdest.datatype = "list(neg,network)"
 mdest.placeholder = "0.0.0.0/0"
 mdest:depends("family", "")