* luci/libs/uvl: extend network scheme to allow proto=none for interfaces

[project/luci.git] / libs / uvl / root / lib / uci / schema / default / firewall

diff --git a/libs/uvl/root/lib/uci/schema/default/firewall b/libs/uvl/root/lib/uci/schema/default/firewall
index dc488d4..0f4bb26 100644 (file)
--- a/libs/uvl/root/lib/uci/schema/default/firewall
+++ b/libs/uvl/root/lib/uci/schema/default/firewall
@@ -15,8 +15,8 @@ config variable
        option name     'network'
        option title    'Associated network of this firewall zone'
        option section  'firewall.zone'
-#      option valueof  'network.interface'
-#      option type     'lazylist'
+       option valueof  'network.interface'
+       option multival true
 
 config variable
        option name     'forward'
@@ -104,6 +104,12 @@ config section
        option package  'firewall'
        list   depends  'target, src'
        list   depends  'target, dest'
+       list   depends  'target, src_ip'
+       list   depends  'target, src_port'
+       list   depends  'target, src_mac'
+       list   depends  'target, dest_ip'
+       list   depends  'target, dest_port'
+       list   depends  'target, proto'
 
 config variable
        option name     'src'
@@ -121,7 +127,7 @@ config variable
        option name     'src_port'
        option title    'Source port'
        option section  'firewall.rule'
-       option datatype 'uint'
+       option datatype 'portrange'
 
 config variable
        option name     'src_mac'
@@ -145,7 +151,7 @@ config variable
        option name     'dest_port'
        option title    'Destination port'
        option section  'firewall.rule'
-       option datatype 'uint'
+       option datatype 'portrange'
 
 config variable
        option name     'proto'
@@ -158,7 +164,6 @@ config variable
        option title    'Option target'
        option section  'firewall.rule'
        option datatype 'string'
-       option required true
 
 
 
@@ -183,13 +188,13 @@ config variable
        option name     'src_port'
        option title    'Source port'
        option section  'firewall.redirect'
-       option datatype 'uint'
+       option datatype 'portrange'
 
 config variable
        option name     'src_dport'
        option title    'Source destination port'
        option section  'firewall.redirect'
-       option datatype 'uint'
+       option datatype 'portrange'
 
 config variable
        option name     'src_mac'
@@ -213,7 +218,7 @@ config variable
        option name     'dest_port'
        option title    'Destination port'
        option section  'firewall.redirect'
-       option datatype 'uint'
+       option datatype 'portrange'
 
 config variable
        option name     'proto'