MT#5733 use transport option on sipp

bin/check.sh

@@ -192,11 +192,12 @@ function check_port
 #$1 is filename
 function get_ip
 {
-  ip=$(grep "$1" ${SCEN_CHECK_DIR}/scenario.csv|cut -d\; -f2| tr -d '\n')
+  transport=$(grep "$1" ${SCEN_CHECK_DIR}/scenario.csv|cut -d\; -f2| tr -d '\n')
+  ip=$(grep "$1" ${SCEN_CHECK_DIR}/scenario.csv|cut -d\; -f3| tr -d '\n')
   if [[ $? -ne 0 ]]; then
     error_helper "cannot find $1 ip on ${SCEN_CHECK_DIR}/scenario.csv" 10
   fi
-  peer_host=$(grep "$1" ${SCEN_CHECK_DIR}/scenario.csv|cut -d\; -f3| tr -d '\n')
+  peer_host=$(grep "$1" ${SCEN_CHECK_DIR}/scenario.csv|cut -d\; -f4| tr -d '\n')
 }
 
 #$1 is filename
@@ -261,9 +262,9 @@ function run_sipp
     echo "$(date) - Running ${base} $ip:${PORT}-${MPORT}"
     if [ -f ${SCEN_CHECK_DIR}/${base}_reg.xml ]; then
       echo "$(date) - Register ${base} $ip:${PORT}-${MPORT}"
-      ${BIN_DIR}/sipp.sh -i $ip -p ${PORT} -r ${SCEN_CHECK_DIR}/${base}_reg.xml
+      ${BIN_DIR}/sipp.sh -T $transport -i $ip -p ${PORT} -r ${SCEN_CHECK_DIR}/${base}_reg.xml
     fi
-    ${BIN_DIR}/sipp.sh -i $ip -p ${PORT} -m ${MPORT} -r ${SCEN_CHECK_DIR}/${base}.xml &
+    ${BIN_DIR}/sipp.sh -T $transport -i $ip -p ${PORT} -m ${MPORT} -r ${SCEN_CHECK_DIR}/${base}.xml &
     responder_pid="${responder_pid} ${base}:$!"
     check_port ${PORT}
     PORT=$port
@@ -278,7 +279,7 @@ function run_sipp
     is_enabled $(basename $send)
     get_ip $(basename $send)
     echo "$(date) - Running ${base} $ip:50602-7002"
-    ${BIN_DIR}/sipp.sh -i $ip -p 50602 -m 7002 $send
+    ${BIN_DIR}/sipp.sh -T $transport -i $ip -p 50602 -m 7002 $send
     if [[ $? -ne 0 ]]; then
       echo "$(date) - $base error"
       status=1

bin/sipp.sh

@@ -20,17 +20,18 @@
 #
 function usage
 {
-  echo "Usage: sipp.sh [-p PORT] [-m MPORT] [-t TIMEOUT] [-r] scenario.xml"
+  echo "Usage: sipp.sh [-p PORT] [-m MPORT] [-t TIMEOUT] [-r] [-T TRANSPORT] scenario.xml"
   echo "Options:"
   echo -e "\t-p: sip port. default 50602/50603(responder)"
   echo -e "\t-m: media port"
   echo -e "\t-t: timeout. default 10/25(responder)"
   echo -e "\t-i: IP. default 127.0.0.1"
+  echo -e "\t-T: transport [UDP|TCP] default UDP"
   echo "Arguments:"
   echo -e "\t sipp_scenario.xml file"
 }
 
-while getopts 'hrp:m:t:i:' opt; do
+while getopts 'hrp:m:t:i:T:' opt; do
   case $opt in
     h) usage; exit 0;;
     r) RESP=1;;
@@ -38,6 +39,7 @@ while getopts 'hrp:m:t:i:' opt; do
     m) MPORT=$OPTARG;;
     t) TIMEOUT=$OPTARG;;
     i) IP=$OPTARG;;
+    T) TRANSPORT=${OPTARG,,};;
   esac
 done
 shift $(($OPTIND - 1))
@@ -57,6 +59,12 @@ IP=${IP:-"127.0.0.1"}
 IP_SERVER=${IP_SERVER:-"127.0.0.1"}
 MAX="5000"
 
+if [ ! -z ${TRANSPORT} ] && [ "${TRANSPORT}" == "tcp" ]; then
+    TRANSPORT_ARG="-t t1"
+else
+    TRANSPORT_ARG="-t ul"
+fi
+
 if [ -z ${RESP} ]; then
   if [ ! -z ${MPORT} ]; then
     MPORT_ARG="-mp ${MPORT}"
@@ -64,10 +72,10 @@ if [ -z ${RESP} ]; then
   PORT=${PORT:-"50602"}
   TIMEOUT=${TIMEOUT:-"10"}
 
-  sipp -max_socket $MAX \
+  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=$?
@@ -78,8 +86,8 @@ else
   PORT=${PORT:-"50603"}
   TIMEOUT=${TIMEOUT:-"25"}
 
-  sipp -max_socket $MAX \
-    -inf ${BASE_DIR}/callee.csv \
+  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} \
     -timeout ${TIMEOUT} -timeout_error -trace_err \