From 8149321fedd0085f18783d41490a7d4043f7716c Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Tue, 24 Oct 2017 12:22:40 +0200
Subject: [PATCH] udp_proxy_wrapper.sh: fix cleanup not cleaning up

Fixed cleanup leaving the actual udp_proxy behind and only killing an
intermediate shell process.

Fixed trap handler cleaning up but then not dying.
---
 programs/test/udp_proxy_wrapper.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/test/udp_proxy_wrapper.sh b/programs/test/udp_proxy_wrapper.sh
index fa13596d69..29033d5d17 100755
--- a/programs/test/udp_proxy_wrapper.sh
+++ b/programs/test/udp_proxy_wrapper.sh
@@ -29,7 +29,7 @@ stop_server() {
 cleanup() {
     stop_server
     stop_proxy
-    return 1
+    exit 129
 }
 
 trap cleanup INT TERM HUP
@@ -96,7 +96,7 @@ echo "  * Start proxy in background ..."
 if [ $VERBOSE -gt 0 ]; then
     echo "[ $tpxy_cmd_snippet ]"
 fi
-eval "$tpxy_cmd_snippet" >/dev/null 2>&1 &
+eval exec "$tpxy_cmd_snippet" >/dev/null 2>&1 &
 tpxy_pid=$!
 
 if [ $VERBOSE -gt 0 ]; then
@@ -108,7 +108,7 @@ if [ $VERBOSE -gt 0 ]; then
     echo "[ $SRV_BIN $* ]"
 fi
 
-"$SRV_BIN" "$@" >&2 &
+exec "$SRV_BIN" "$@" >&2 &
 srv_pid=$!
 
 wait $srv_pid