From ceb8017f03e58fc7545751a74e78025bad32c8eb Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 29 Nov 2016 21:02:05 +0100
Subject: tests: be sure we get all messages

---
 src/tests/netns.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/tests/netns.sh')

diff --git a/src/tests/netns.sh b/src/tests/netns.sh
index 38d52da..4e8465c 100755
--- a/src/tests/netns.sh
+++ b/src/tests/netns.sh
@@ -43,6 +43,8 @@ waitiface() { pretty "${1//*-}" "wait for $2 to come up"; ip netns exec "$1" bas
 cleanup() {
 	set +e
 	exec 2>/dev/null
+	echo "$orig_message_cost" > /proc/sys/net/core/message_cost
+	echo "$orig_strict_writes" > /proc/sys/kernel/sysctl_writes_strict
 	ip0 link del dev wg0
 	ip1 link del dev wg0
 	ip2 link del dev wg0
@@ -53,7 +55,11 @@ cleanup() {
 	exit
 }
 
+orig_strict_writes="$(< /proc/sys/kernel/sysctl_writes_strict)"
+orig_message_cost="$(< /proc/sys/net/core/message_cost)"
 trap cleanup EXIT
+echo 1 > /proc/sys/kernel/sysctl_writes_strict
+echo 0 > /proc/sys/net/core/message_cost
 
 ip netns del $netns0 2>/dev/null || true
 ip netns del $netns1 2>/dev/null || true
@@ -225,7 +231,6 @@ waitiface $netns0 vethrs
 waitiface $netns1 vethc
 waitiface $netns2 veths
 
-n0 bash -c 'echo 1 > /proc/sys/kernel/sysctl_writes_strict'
 n0 bash -c 'echo 1 > /proc/sys/net/ipv4/ip_forward'
 n0 bash -c 'echo 2 > /proc/sys/net/netfilter/nf_conntrack_udp_timeout'
 n0 bash -c 'echo 2 > /proc/sys/net/netfilter/nf_conntrack_udp_timeout_stream'
-- 
cgit v1.2.3-59-g8ed1b