summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/hash:ip,port,ip.t6
-rw-r--r--tests/hash:ip,port.t6
-rw-r--r--tests/hash:ip.t8
-rw-r--r--tests/hash:ip6,port,ip6.t6
-rw-r--r--tests/hash:ip6,port.t6
-rw-r--r--tests/hash:ip6.t2
-rw-r--r--tests/hash:net,port.t6
-rw-r--r--tests/hash:net6,port.t6
8 files changed, 46 insertions, 0 deletions
diff --git a/tests/hash:ip,port,ip.t b/tests/hash:ip,port,ip.t
index b658b5d..951cf26 100644
--- a/tests/hash:ip,port,ip.t
+++ b/tests/hash:ip,port,ip.t
@@ -46,6 +46,12 @@
0 diff -I 'Size in memory.*' .foo hash:ip,port,ip.t.list1 && rm .foo
# Flush test set
0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1.1.1.1-1.1.1.4,80-84,2.2.2.2
+# Delete multiple elements in one step
+0 ipset del test 1.1.1.2-1.1.1.3,tcp:81-82,2.2.2.2
+# Check number of elements after multi-add/multi-del
+0 n=`ipset save test|wc -l` && test $n -eq 17
# Delete test set
0 ipset destroy test
# eof
diff --git a/tests/hash:ip,port.t b/tests/hash:ip,port.t
index 7d2abca..82f8716 100644
--- a/tests/hash:ip,port.t
+++ b/tests/hash:ip,port.t
@@ -38,6 +38,12 @@
0 diff -I 'Size in memory.*' .foo hash:ip,port.t.list1 && rm .foo
# Flush test set
0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1.1.1.1-1.1.1.4,80-84
+# Delete multiple elements in one step
+0 ipset del test 1.1.1.2-1.1.1.3,tcp:81-82
+# Check number of elements after multi-add/multi-del
+0 n=`ipset save test|wc -l` && test $n -eq 17
# Delete test set
0 ipset destroy test
# Create a set
diff --git a/tests/hash:ip.t b/tests/hash:ip.t
index 6293ae5..a054751 100644
--- a/tests/hash:ip.t
+++ b/tests/hash:ip.t
@@ -30,6 +30,14 @@
0 diff -I 'Size in memory.*' .foo hash:ip.t.list0 && rm .foo
# IP: Flush test set
0 ipset -F test
+# IP: Add multiple elements in one step
+0 ipset -A test 1.1.1.1-1.1.1.5
+# IP: Delete multiple elements in one step
+0 ipset -D test 1.1.1.2-1.1.1.5
+# IP: Test element after deletion
+0 ipset -T test 1.1.1.1
+# IP: Test deleted element
+1 ipset -T test 1.1.1.2
# IP: Delete test set
0 ipset -X test
# IP: Restore values so that rehashing is triggered
diff --git a/tests/hash:ip6,port,ip6.t b/tests/hash:ip6,port,ip6.t
index bfdc298..93d2861 100644
--- a/tests/hash:ip6,port,ip6.t
+++ b/tests/hash:ip6,port,ip6.t
@@ -46,6 +46,12 @@
0 diff -I 'Size in memory.*' .foo hash:ip6,port,ip6.t.list1 && rm .foo
# Flush test set
0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1::1,udp:80-85,2::2
+# Delete multiple elements in one step
+0 ipset del test 1::1,udp:81-85,2::2
+# Check elements after multiple add/del
+0 ipset test test 1::1,udp:80,2::2
# Delete test set
0 ipset destroy test
# eof
diff --git a/tests/hash:ip6,port.t b/tests/hash:ip6,port.t
index ead59a5..26d5300 100644
--- a/tests/hash:ip6,port.t
+++ b/tests/hash:ip6,port.t
@@ -38,6 +38,12 @@
0 diff -I 'Size in memory.*' .foo hash:ip6,port.t.list1 && rm .foo
# Flush test set
0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1::1,udp:80-85
+# Delete multiple elements in one step
+0 ipset del test 1::1,udp:81-84
+# Check elements after multiple add/del
+0 ipset test test 1::1,udp:80
# Delete test set
0 ipset destroy test
# eof
diff --git a/tests/hash:ip6.t b/tests/hash:ip6.t
index 7b206c7..76a6879 100644
--- a/tests/hash:ip6.t
+++ b/tests/hash:ip6.t
@@ -32,6 +32,8 @@
0 diff -I 'Size in memory.*' .foo hash:ip6.t.list0 && rm .foo
# IP: Flush test set
0 ipset -F test
+# IP: Try to add multiple elements in one step
+1 ipset -A test 1::1-1::10
# IP: Delete test set
0 ipset -X test
# Network: Create a set with timeout
diff --git a/tests/hash:net,port.t b/tests/hash:net,port.t
index d2d8e8a..e0f922d 100644
--- a/tests/hash:net,port.t
+++ b/tests/hash:net,port.t
@@ -46,6 +46,12 @@
0 diff -I 'Size in memory.*' .foo hash:net,port.t.list1 && rm .foo
# Flush test set
0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1.1.1.1/24,80-84 timeout 0
+# Delete multiple elements in one step
+0 ipset del test 1.1.1.2/24,tcp:81-82
+# Check number of elements after multi-add/multi-del
+0 n=`ipset save test|wc -l` && test $n -eq 4
# Delete test set
0 ipset destroy test
# eof
diff --git a/tests/hash:net6,port.t b/tests/hash:net6,port.t
index 099c4f5..9cce42f 100644
--- a/tests/hash:net6,port.t
+++ b/tests/hash:net6,port.t
@@ -46,6 +46,12 @@
0 diff -I 'Size in memory.*' .foo hash:net6,port.t.list1 && rm .foo
# Flush test set
0 ipset flush test
+# Add multiple elements in one step
+0 ipset add test 1::1/64,80-84 timeout 0
+# Delete multiple elements in one step
+0 ipset del test 1::1/64,tcp:81-82
+# Check number of elements after multi-add/multi-del
+0 n=`ipset save test|wc -l` && test $n -eq 4
# Delete test set
0 ipset destroy test
# eof