hash:net,iface type introduced

The hash:net,iface type makes possible to store network address and
interface name pairs in a set. It's mostly suitable for egress
and ingress filtering. Examples:

	# ipset create test hash:net,iface
	# ipset add test 192.168.0.0/16,eth0
	# ipset add test 192.168.0.0/24,eth1

4 files changed, 78 insertions, 0 deletions

diff --git a/tests/hash:net,iface.t b/tests/hash:net,iface.t
new file mode 100644
index 0000000..7c73264
--- /dev/null
+++ b/tests/hash:net,iface.t
@@ -0,0 +1,57 @@
+# Create a set
+0 ipset create test hash:net,iface hashsize 128
+# Add zero valued element
+1 ipset add test 0.0.0.0/0,eth0
+# Test zero valued element
+1 ipset test test 0.0.0.0/0,eth0
+# Delete zero valued element
+1 ipset del test 0.0.0.0/0,eth0
+# Try to add /0
+1 ipset add test 1.1.1.1/0,eth0
+# Try to add /32
+0 ipset add test 1.1.1.1/32,eth0
+# Add almost zero valued element
+0 ipset add test 0.0.0.0/1,eth0
+# Test almost zero valued element
+0 ipset test test 0.0.0.0/1,eth0
+# Delete almost zero valued element
+0 ipset del test 0.0.0.0/1,eth0
+# Test deleted element
+1 ipset test test 0.0.0.0/1,eth0
+# Delete element not added to the set
+1 ipset del test 0.0.0.0/1,eth0
+# Add first random network
+0 ipset add test 2.0.0.1/24,eth0
+# Add second random network
+0 ipset add test 192.168.68.69/27,eth1
+# Test first random value
+0 ipset test test 2.0.0.255,eth0
+# Test second random value
+0 ipset test test 192.168.68.95,eth1
+# Test value not added to the set
+1 ipset test test 2.0.1.0,eth0
+# Test value not added to the set
+1 ipset test test 2.0.0.255,eth1
+# Test value not added to the set
+1 ipset test test 192.168.68.95,eth0
+# Try to add IP address
+0 ipset add test 2.0.0.1,eth0
+# List set
+0 ipset list test | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0
+# Check listing
+0 diff -u -I 'Size in memory.*' .foo hash:net,iface.t.list0
+# Flush test set
+0 ipset flush test
+# Delete test set
+0 ipset destroy test
+# Create test set
+0 ipset new test hash:net,iface
+# Add networks in range notation
+0 ipset add test 10.2.0.0-10.2.1.12,eth0
+# List set
+0 ipset -L test 2>/dev/null > .foo0 && ./sort.sh .foo0
+# Check listing
+0 diff -u -I 'Size in memory.*' .foo hash:net,iface.t.list2
+# Delete test set
+0 ipset destroy test
+# eof
diff --git a/tests/hash:net,iface.t.list0 b/tests/hash:net,iface.t.list0
new file mode 100644
index 0000000..1771fca
--- /dev/null
+++ b/tests/hash:net,iface.t.list0
@@ -0,0 +1,10 @@
+Name: test
+Type: hash:net,iface
+Header: family inet hashsize 128 maxelem 65536 
+Size in memory: 2928
+References: 0
+Members:
+1.1.1.1,eth0
+192.168.68.64/27,eth1
+2.0.0.0/24,eth0
+2.0.0.1,eth0
diff --git a/tests/hash:net,iface.t.list2 b/tests/hash:net,iface.t.list2
new file mode 100644
index 0000000..89aa033
--- /dev/null
+++ b/tests/hash:net,iface.t.list2
@@ -0,0 +1,10 @@
+Name: test
+Type: hash:net,iface
+Header: family inet hashsize 1024 maxelem 65536 
+Size in memory: 17168
+References: 0
+Members:
+10.2.0.0/24,eth0
+10.2.1.0/29,eth0
+10.2.1.12,eth0
+10.2.1.8/30,eth0
diff --git a/tests/runtest.sh b/tests/runtest.sh
index a75cee2..ff5c492 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -10,6 +10,7 @@ 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 hash:net,iface.t"
 tests="$tests setlist restore"
 # tests="$tests iptree iptreemap"