From: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Date: Sat, 23 Nov 2024 07:53:36 +0000 (+0100)
Subject: socat: added a timeout to ensure that it exits eventually
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9f625ae7e2af166166c3ac819296505f2b274d4b;p=users%2Fdwmw2%2Fopenconnect.git

socat: added a timeout to ensure that it exits eventually

Relates: #757

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
---

diff --git a/tests/common.sh b/tests/common.sh
index 6f5fa165..0383267e 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -103,7 +103,7 @@ launch_simple_pppd() {
        #    the config packets exchanged, causing retries and leading to a longer negotiation period.
        #    [use `socat -x` for a hex log of I/O to/from the connected sockets]
 
-       LD_PRELOAD=libsocket_wrapper.so socat -4 -d -d \
+       LD_PRELOAD=libsocket_wrapper.so socat -t 120 -T 120 -4 -d -d \
 		 SYSTEM:"LD_PRELOAD= $SUDO $PPPD noauth local debug nodefaultroute logfile '$LOGFILE' $*",pty,raw,echo=0 \
 		 OPENSSL-LISTEN:443,verify=0,cert="$CERT",key="$KEY" 2>&1 &
        PID=$!