Add tests to check hash:ip,port,net type

4 files changed, 58 insertions, 5 deletions

diff --git a/tests/hash:ip,port,net.t b/tests/hash:ip,port,net.t
new file mode 100644
index 0000000..97eae8d
--- /dev/null
+++ b/tests/hash:ip,port,net.t
@@ -0,0 +1,41 @@
+# Create a set with timeout
+0 ipset create test hash:ip,port,net timeout 5
+# Add partly zero valued element
+0 ipset add test 2.0.0.1,0,192.168.0.0/24
+# Test partly zero valued element
+0 ipset test test 2.0.0.1,0,192.168.0.0/24
+# Delete partly zero valued element
+0 ipset del test 2.0.0.1,0,192.168.0.0/24
+# Add first random value
+0 ipset add test 2.0.0.1,5,192.168.0.0/24
+# Add second random value
+0 ipset add test 2.1.0.0,128,10.0.0.0/16
+# Test first random value
+0 ipset test test 2.0.0.1,5,192.168.0.0/24
+# Test second random value
+0 ipset test test 2.1.0.0,128,10.0.0.0/16
+# Test value not added to the set
+1 ipset test test 2.0.0.1,4,10.0.0.0/16
+# Delete value not added to the set
+1 ipset del test 2.0.0.1,6,10.0.0.0/16
+# Test value before first random value
+1 ipset test test 2.0.0.0,5,192.168.0.0/24
+# Test value after second random value
+1 ipset test test 2.1.0.1,128,10.0.0.0/16
+# Try to add value before first random value
+0 ipset add test 2.0.0.0,5,192.168.0.0/25
+# Try to add value after second random value
+0 ipset add test 2.1.0.1,128,10.0.0.0/17
+# List set
+0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
+# Check listing
+0 diff -I 'Size in memory.*' .foo hash:ip,port,net.t.list0 && rm .foo
+# Sleep 5s so that elements can time out
+0 sleep 5
+# List set
+0 n=`ipset save test|wc -l` && test $n -eq 1
+# Flush test set
+0 ipset flush test
+# Delete set
+0 ipset destroy test
+# eof
diff --git a/tests/hash:ip,port,net.t.list0 b/tests/hash:ip,port,net.t.list0
new file mode 100644
index 0000000..967e693
--- /dev/null
+++ b/tests/hash:ip,port,net.t.list0
@@ -0,0 +1,11 @@
+Name: test
+Type: hash:ip,port,net
+Header: family inet hashsize 1024 maxelem 65536 timeout x 
+Size in memory: 8720
+References: 0
+Members:
+2.0.0.0,tcp:5,192.168.0.0/25 timeout x
+2.0.0.1,tcp:5,192.168.0.0/24 timeout x
+2.1.0.0,tcp:128,10.0.0.0/16 timeout x
+2.1.0.1,tcp:128,10.0.0.0/17 timeout x
+
diff --git a/tests/hash:ip6,port,net6.t.list0 b/tests/hash:ip6,port,net6.t.list0
index cd9bffe..3898d36 100644
--- a/tests/hash:ip6,port,net6.t.list0
+++ b/tests/hash:ip6,port,net6.t.list0
@@ -1,11 +1,11 @@
 Name: test
 Type: hash:ip,port,net
-Header: family inet6 family inet6 hashsize 1024 maxelem 65536 
+Header: family inet6 hashsize 1024 maxelem 65536 
 Size in memory: 9928
 References: 0
 Members:
-2:1::1,128,::/12
-2:1::,128,::/12
-2::1,5,1::/24
-2::,5,1::/24
+2:1::1,tcp:128,::/12
+2:1::,tcp:128,::/12
+2::1,tcp:5,1::/24
+2::,tcp:5,1::/24
 
diff --git a/tests/runtest.sh b/tests/runtest.sh
index 6ce4477..cc2e9db 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -9,6 +9,7 @@ tests="$tests iphash hash:ip hash:ip6"
 tests="$tests ipporthash hash:ip,port hash:ip6,port"
 tests="$tests ipportiphash hash:ip,port,ip hash:ip6,port,ip6"
 tests="$tests nethash hash:net hash:net6 hash:net,port hash:net6,port"
+tests="$tests hash:ip,port,net hash:ip6,port,net6"
 tests="$tests setlist"
 tests="$tests iptree iptreemap"