From 88c32a510e0786cd915ef7a0d14edd8d601b5dbf Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Tue, 22 Aug 2023 09:30:51 -0400
Subject: [PATCH] Wrap script in a `bwrap` environment

---
 scripts/dtls.test | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/dtls.test b/scripts/dtls.test
index 72c87ac6a..6d98667a2 100755
--- a/scripts/dtls.test
+++ b/scripts/dtls.test
@@ -15,6 +15,15 @@ DO_DELAY_TEST=${DO_DELAY_TEST:-0}
 
 #set -x # enable debug output
 
+# bwrap execution environment to avoid port conflicts
+if [ "${AM_BWRAPPED-}" != "yes" ]; then
+    bwrap_path="$(command -v bwrap)"
+    if [ -n "$bwrap_path" ]; then
+        export AM_BWRAPPED=yes
+        exec "$bwrap_path" --cap-add ALL --unshare-net --dev-bind / / "$0" "$@"
+    fi
+fi
+
 cleanup () {
     echo
     echo "Cleaning up..."
@@ -35,12 +44,8 @@ cleanup () {
 
 trap cleanup err exit
 
-RANDOM_PORT_OFFSET=$(($RANDOM % 5000))
-echo "RANDOM=$RANDOM_PORT_OFFSET"
-PROXY_PORT=$((1200+$RANDOM_PORT_OFFSET))
-SERVER_PORT=$((1201+$RANDOM_PORT_OFFSET))
-echo "PROXY_PORT=$PROXY_PORT"
-echo "SERVER_PORT=$SERVER_PORT"
+PROXY_PORT=1234
+SERVER_PORT=4321
 KEY_UPDATE_SIZE=35
 NUM_TESTS_FAILED=0
 NUM_TESTS_RUN=0