commit bedcb3eb24da35f934b7b1468d18688740977f77
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Jun 25 09:52:54 2020 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Aug 14 11:00:40 2020 +0200
tree d8718801ee536a1f175e55bda2912921783ec35d
parent cbd5c0334381dedb97b5750287c4947c18d755a6

Fix logic error in setting client port

We need to do this after we possibly added the proxy.

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 1c7bc0d..a038463 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -621,13 +621,6 @@
         return
     fi
 
-    # fix client port
-    if [ -n "$PXY_CMD" ]; then
-        CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$PXY_PORT/g )
-    else
-        CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$SRV_PORT/g )
-    fi
-
     # update DTLS variable
     detect_dtls "$SRV_CMD"
 
@@ -637,6 +630,13 @@
         PXY_CMD="$P_PXY"
     fi
 
+    # fix client port
+    if [ -n "$PXY_CMD" ]; then
+        CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$PXY_PORT/g )
+    else
+        CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$SRV_PORT/g )
+    fi
+
     # prepend valgrind to our commands if active
     if [ "$MEMCHECK" -gt 0 ]; then
         if is_polar "$SRV_CMD"; then