TT#5105 bin/check.sh: check media port+2, sipp uses media port +2

* fix sipp transport arguments
* change port range of media from 6003 to 46003 for responders
* change port range of media from 7002 to 45003 for senders
* change port from 50602 to 51602 for senders

Change-Id: Ia76daeb9098e05d67c6fb95ebe945cdb59c8a493

bin/check.sh

@@ -253,14 +253,40 @@ function stop_capture
 # $1 port to check
 function check_port
 {
-  status=0
-  port=$1
-  step=${2:-1}
+  local status=0
+  local port=$1
+  local step=${2:-1}
+
+  until [ $status -eq 1 ]; do
+    if netstat -n | grep -q ":$port " ; then
+      port=$((port + step))
+    else
+      status=1
+    fi
+  done
+  echo $port
+}
+
+# $1 media port to check
+# sipp uses media_port and media_port+2
+function check_mport
+{
+  local status=0
+  local mport=$1
+  local step=${2:-3}
+  local mport2
   until [ $status -eq 1 ]; do
-    let port=${port}+${step}
-    netstat -n | grep -q ":$port "
-    status=$?
+    if ! (netstat -n | grep -q ":${mport} ") ; then
+      mport2=$((mport + 2))
+      if ! (netstat -n | grep -q ":${mport2} "); then
+        status=1
+      fi
+    fi
+    if [ $status -eq 0 ] ; then
+      mport=$((mport + step))
+    fi
   done
+  echo $mport
 }
 
 #$1 is filename
@@ -304,10 +330,10 @@ function copy_logs
 # $1 sipp xml scenario file
 function run_sipp
 {
-  check_port 50603
-  local PORT=$port
-  check_port 6003 3
-  local MPORT=$port
+  local PORT
+  local MPORT
+  PORT=$(check_port 50603)
+  MPORT=$(check_mport 46003)
 
   local base=""
   local pid=""
@@ -370,21 +396,21 @@ function run_sipp
     responder_pid="${responder_pid} ${base}:${pid}"
 
     if [ "${foreign_dom}" == "no" ]; then
-      check_port ${PORT}
-      PORT=$port
+      PORT=$(check_port "${PORT}")
     fi
-    check_port ${MPORT} 3
-    MPORT=$port
+    MPORT=$(check_mport "${MPORT}")
   done
 
-  status=0
+  local status=0
   # let's fire sipp scenarios
   for send in $(find "${SCEN_CHECK_DIR}" -type f -name 'sipp_scenario[0-9][0-9].xml'| sort); do
     base=$(basename "$send" .xml)
     is_enabled "$(basename "$send")"
     get_ip "$(basename "$send")"
-    echo "$(date) - Running ${base} $ip:50602-7002"
-    if ! "${BIN_DIR}/sipp.sh" -T "$transport" -i "$ip" -p 50602 -m 7002 "$send" ; then
+    PORT=$(check_port 51602)
+    MPORT=$(check_mport 45003)
+    echo "$(date) - Running ${base} $ip:${PORT}-${MPORT}"
+    if ! "${BIN_DIR}/sipp.sh" -T "$transport" -i "$ip" -p "${PORT}" -m "${MPORT}" "$send" ; then
       echo "$(date) - $base error"
       status=1
     fi

bin/sipp.sh

@@ -65,7 +65,7 @@ MAX="5000"
 if [ "${TRANSPORT}" == "tcp" ]; then
     TRANSPORT_ARG="-t t1"
 else
-    TRANSPORT_ARG="-t ul"
+    TRANSPORT_ARG="-t u1"
 fi
 # shellcheck disable=SC2086
 {
@@ -94,7 +94,7 @@ else
     sipp -max_socket $MAX ${TRANSPORT_ARG}\
       -inf "${BASE_DIR}/callee.csv" -inf "${BASE_DIR}/caller.csv" \
       -sf "$1" -i "$IP" -p "$PORT" \
-      -nr -nd -t ul -m 1 ${MPORT_ARG} \
+      -nr -nd -m 1 ${MPORT_ARG} \
       -timeout "${TIMEOUT}" -timeout_error -trace_err \
       "$IP_SERVER" &> /dev/null
     status=$?
@@ -102,7 +102,7 @@ else
     tmp=$(sipp $BACK -max_socket $MAX ${TRANSPORT_ARG}\
       -inf "${BASE_DIR}/callee.csv" -inf "${BASE_DIR}/caller.csv" \
       -sf "$1" -i "$IP" -p "$PORT" \
-      -nr -nd -t ul -m 1 ${MPORT_ARG} \
+      -nr -nd -m 1 ${MPORT_ARG} \
       -timeout "${TIMEOUT}" -timeout_error -trace_err \
       "$IP_SERVER")
     # shellcheck disable=SC2046