* luci/libs/uvl:

	- implement port and portrange datatypes
	- fix datatype of port ranges in firewall scheme

diff --git a/libs/uvl/luasrc/uvl/datatypes.lua b/libs/uvl/luasrc/uvl/datatypes.lua
index 60377e289e076ba74147fc3fd028525e0339db12..e6a4c16887463728800535a0cf90f29dbdf60f41 100644 (file)
--- a/libs/uvl/luasrc/uvl/datatypes.lua
+++ b/libs/uvl/luasrc/uvl/datatypes.lua
@@ -83,6 +83,20 @@ function ip6prefix( val )
        return ( val and val >= 0 and val <= 128 )
 end
 
+function port( val )
+       val = tonumber(val)
+       return ( val and val >= 1 and val <= 65535 )
+end
+
+function portrange( val )
+       local p1, p2 = val:match("^(%d+)%-(%d+)$")
+       if p1 and p2 and port(p1) and port(p2) then
+               return true
+       else
+               return port(val)
+       end
+end
+
 function macaddr( val )
        if val and val:match(
                "^[a-fA-F0-9]+:[a-fA-F0-9]+:[a-fA-F0-9]+:" ..

diff --git a/libs/uvl/root/lib/uci/schema/default/firewall b/libs/uvl/root/lib/uci/schema/default/firewall
index e421b1103098071f95480a930d73c05b1790e054..fc58705cdee10e73e86559ad75f9908bb25b79cc 100644 (file)
--- a/libs/uvl/root/lib/uci/schema/default/firewall
+++ b/libs/uvl/root/lib/uci/schema/default/firewall
@@ -121,7 +121,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 +145,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'
@@ -183,13 +183,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 +213,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'