Add compression.test

diff --git a/test/Makefile.am b/test/Makefile.am
index 8c8d08fe1d76fbee882de36e5db467acc66d99bd..da77fb790fcbab2ede1f9207c960b19d71aec9f9 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,6 +2,7 @@ TESTS = \
        basic.test \
        executables.test \
        commandline.test \
+       compression.test \
        import-export.test \
        invite-join.test \
        invite-offline.test \

diff --git a/test/algorithms.test b/test/algorithms.test
index bf073a56724fce9bf144a5c027a98dbd1de2dd1c..dcf055a01fc1d1d1e82175716ff383eb88b90338 100755 (executable)
--- a/test/algorithms.test
+++ b/test/algorithms.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initialize two nodes

diff --git a/test/basic.test b/test/basic.test
index b2a3e472b5ab442f0a1f79d0d4d30551f3f80545..87c57842b613791e656bfa9de67cab624fe3dd67 100755 (executable)
--- a/test/basic.test
+++ b/test/basic.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initialize and test one node

diff --git a/test/commandline.test b/test/commandline.test
index 5e9fb85a242fa8d3d36c2efa9ea022ae6ac41b34..241cb25f172c2351b41ef0338019c5a29a263bdf 100755 (executable)
--- a/test/commandline.test
+++ b/test/commandline.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initialize one node

diff --git a/test/compression.test b/test/compression.test
new file mode 100755 (executable)
index 0000000..77efd6d
--- /dev/null
+++ b/test/compression.test
@@ -0,0 +1,132 @@
+#!/bin/sh
+
+. ./testlib.sh
+
+test "$(id -u)" = "0" || exit $EXIT_SKIP_TEST
+test -e /dev/net/tun || exit $EXIT_SKIP_TEST
+ip netns list || exit $EXIT_SKIP_TEST
+command -v socat || exit $EXIT_SKIP_TEST
+
+ip_foo=192.168.1.1
+ip_bar=192.168.1.2
+port_foo=30100
+recv_port_foo=30101
+mask=24
+
+echo '[STEP] Determining supported compression levels'
+
+features=$(tincd foo --version)
+bogus_levels="-1 13"
+levels=0
+
+add_levels() {
+  algo=$1
+  shift
+
+  if echo "$features" | grep "comp_$algo"; then
+    levels="$levels $*"
+  else
+    bogus_levels="$bogus_levels $*"
+  fi
+}
+
+add_levels zlib 1 2 3 4 5 6 7 8 9
+add_levels lzo 10 11
+add_levels lz4 12
+
+echo "Supported compression levels: $levels"
+echo "Unsupported compression levels: $bogus_levels"
+
+echo [STEP] Create network namespaces
+
+ip netns add foo
+ip netns add bar
+tmp_file=$(mktemp)
+
+cleanup_hook() {
+  ip netns del foo
+  ip netns del bar
+  rm -f "$tmp_file"
+}
+
+echo [STEP] Initialize two nodes
+
+tinc foo <<EOF
+init foo
+set Subnet $ip_foo
+set Interface foo
+set Port $port_foo
+set Address localhost
+EOF
+
+tinc bar <<EOF
+init bar
+set Subnet $ip_bar
+set Interface bar
+set ConnectTo foo
+EOF
+
+# shellcheck disable=SC2016
+create_script foo tinc-up "
+  ip link set dev \$INTERFACE netns foo
+  ip netns exec foo ip addr add $ip_foo/$mask dev \$INTERFACE
+  ip netns exec foo ip link set \$INTERFACE up
+"
+
+# shellcheck disable=SC2016
+create_script bar tinc-up "
+  ip link set dev \$INTERFACE netns bar
+  ip netns exec bar ip addr add $ip_bar/$mask dev \$INTERFACE
+  ip netns exec bar ip link set \$INTERFACE up
+"
+
+echo [STEP] Exchange configuration files
+
+tinc foo export | tinc bar exchange | tinc foo import
+
+echo [STEP] Test supported compression levels
+
+ref_file=$0
+
+create_script foo hosts/bar-up
+create_script bar hosts/foo-up
+
+for level in $levels; do
+  echo "[STEP] Testing compression level $level"
+
+  tinc foo set Compression "$level"
+  tinc bar set Compression "$level"
+
+  start_tinc foo
+  wait_script foo tinc-up
+
+  start_tinc bar
+  wait_script bar tinc-up
+
+  wait_script foo hosts/bar-up
+  wait_script bar hosts/foo-up
+
+  ip netns exec foo \
+    socat -u TCP4-LISTEN:$recv_port_foo,reuseaddr OPEN:"$tmp_file",creat &
+
+  ip netns exec bar \
+    socat -u OPEN:"$ref_file" TCP4:$ip_foo:$recv_port_foo,retry=30
+
+  diff -w "$ref_file" "$tmp_file"
+
+  tinc foo stop
+  tinc bar stop
+done
+
+echo '[STEP] Invalid compression levels should fail'
+
+for level in $bogus_levels; do
+  echo "[STEP] Testing bogus compression level $level"
+  tinc foo set Compression "$level"
+
+  output=$(must_fail start_tinc foo 2>&1)
+
+  if ! echo "$output" | grep -q 'Bogus compression level'; then
+    bail 'expected message about the wrong compression level'
+  fi
+done

diff --git a/test/executables.test b/test/executables.test
index bc53aed2a3db5236e731f62f31b95ea00365f3cb..96aad992977a23fa243227266c2a2561c3418187 100755 (executable)
--- a/test/executables.test
+++ b/test/executables.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Just test whether the executables work

diff --git a/test/import-export.test b/test/import-export.test
index 9b44e7af5cb4ca457276a211cf4f35cc7a14abe4..9fdfa4971c4ad1b2251047d3663ef5bb1b5b769d 100755 (executable)
--- a/test/import-export.test
+++ b/test/import-export.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initialize three nodes

diff --git a/test/invite-join.test b/test/invite-join.test
index 58edd4a64c27187f628277f12e6ed2b34be045e8..3a9e3a337613761da175968cdbcbf670253df87f 100755 (executable)
--- a/test/invite-join.test
+++ b/test/invite-join.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initialize one node

diff --git a/test/invite-offline.test b/test/invite-offline.test
index 2d7878d5900f88885f209c1854b7e3c272ad029e..aea39b41110e3978bbd98250011fcbea87ce75a8 100755 (executable)
--- a/test/invite-offline.test
+++ b/test/invite-offline.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initialize one node

diff --git a/test/invite-tinc-up.test b/test/invite-tinc-up.test
index 8f09f5eda53e32ff2a5994e48be02c7cf7dcbf85..a288d6e7d2317b9cb5d26b7dff6fb966d021566b 100755 (executable)
--- a/test/invite-tinc-up.test
+++ b/test/invite-tinc-up.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initialize one node

diff --git a/test/legacy-protocol.test b/test/legacy-protocol.test
index 1aef8f282d28d76455a99bcfcde4087bef08d67c..396fc56d92bf0defb21769626ace1ed08f3bb412 100755 (executable)
--- a/test/legacy-protocol.test
+++ b/test/legacy-protocol.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initialize two nodes

diff --git a/test/ns-ping.test b/test/ns-ping.test
index 417ed32841c02bbe8c5b31e8948b497c76ea5cb8..bb76ed392e7ad95ff7a7b7298c566699e02bbf67 100755 (executable)
--- a/test/ns-ping.test
+++ b/test/ns-ping.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo "[STEP] Skip this test if we aren't root or if 'ip netns' does not exist"

diff --git a/test/scripts.test b/test/scripts.test
index 9ef6416442f520f8514c29fd6b2e8ec042904934..a76356aeae3498a1f29dd0ecc9bc2154782022d3 100755 (executable)
--- a/test/scripts.test
+++ b/test/scripts.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initializing server node

diff --git a/test/security.test b/test/security.test
index 76b825dc2e5e52c1274572c7232cfa3770251424..ee7bd46dd30af7b2e79da393be738ea5c05369a6 100755 (executable)
--- a/test/security.test
+++ b/test/security.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Skip this test if tools are missing

diff --git a/test/sptps-basic.test b/test/sptps-basic.test
index 87aee02141513a1b3e3a4f84528ebba0a0dd7cfd..56e3cd00e089a601227fff00acb6bceae0e1eb6d 100755 (executable)
--- a/test/sptps-basic.test
+++ b/test/sptps-basic.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Skip this test if we did not compile sptps_test

diff --git a/test/variables.test b/test/variables.test
index 0164e27a1317362807c0d7a558ef1292ca20cd4e..bcec9fb2427b74b7155308e0a67593950c79429f 100755 (executable)
--- a/test/variables.test
+++ b/test/variables.test
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
 . ./testlib.sh
 
 echo [STEP] Initialize one node