improve output in case of decoding fail. Improve Sy cases with STR management

diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase.sh b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
index 6de9452..5beaa12 100755 (executable)
--- a/example/diameter/launcher/resources/scripts/tinyTestcase.sh
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
@@ -114,11 +114,14 @@ update_testcase () {
   if [ $isrequest -eq 1 ]
   then
     # Send the request
-    # Special case for SNR/SNA (code=8388636): the Session-Id is created on client and received on SLR previously
-    if [ "$code" = "8388636" -a "$adml_type" = "server" ]
+    # Special case for SNR/SNA (code=8388636) and STR (code=275) going to SAPC: the Session-Id is created on client and received on SLR previously
+    if [ "$adml_type" = "server" ]
     then
-      s_send="test|1|$send_command|$xml|$REQUEST_STEP"
-      s_wait="test|1|$wait_command|$code|0"
+      if [ "$code" = "8388636" -o "$code" = "275" ]
+      then
+        s_send="test|1|$send_command|$xml|$REQUEST_STEP"
+        s_wait="test|1|$wait_command|$code|0|||"
+      fi
     fi
 
     echo "$s_send" >> $TESTCASE_BN
@@ -143,8 +146,15 @@ update_testcase () {
     local next_step_number=$((lines+1))
 
     # Wait the request
-    # Special case for SLR/SLA (code=8388635): the Session-Id is created on client
-    [ "$code" = "8388635" -a "$adml_type" = "server" ] && { s_wait="test|1|$wait_command|$code|1" ; REQUEST_STEP=$next_step_number ; }
+    # Special case for SLR/SLA (code=8388635) and STR (code=275) coming from SAPC: the Session-Id is created on client
+    if [ "$adml_type" = "server" ]
+    then
+      if [ "$code" = "8388635" -o "$code" = "275" ]
+      then
+        s_wait="test|1|$wait_command|$code|1"
+        REQUEST_STEP=$next_step_number
+      fi
+    fi
     echo "$s_wait" >> $TESTCASE_BN
 
     # Send the answer

diff --git a/example/diameter/pcapDecoder/tsharkDecoder.sh b/example/diameter/pcapDecoder/tsharkDecoder.sh
index 35a9815..b713b49 100755 (executable)
--- a/example/diameter/pcapDecoder/tsharkDecoder.sh
+++ b/example/diameter/pcapDecoder/tsharkDecoder.sh
@@ -308,7 +308,7 @@ do
   group_array=( $(echo $group | sed 's/,/ /g') )
   echo "Grouping frames ${group_array[*]} ..."
   for frame in ${group_array[@]}; do
-    cat $RESULTS_DIR/$frame.hex >> $tmpdir/diam.$group
+    cat $RESULTS_DIR/$frame.hex >> $tmpdir/diam.$group 2>/dev/null
   done
   cat $tmpdir/diam.$group | tr -d '\n' > $RESULTS_DIR/$frame.hex
   # Delete all frames except last one in the group:
@@ -319,7 +319,7 @@ done
 #segments=( $(cat $tmpdir/diameter_frames | awk -F\| '{ if ($16 == "") print $1 }') )
 segments=( $(echo $to_delete) )
 echo "Deleting superfluous buffers & metadata (${segments[*]}) ..."
-for s in ${segments[@]}; do rm $RESULTS_DIR/${s}.* ; done
+for s in ${segments[@]}; do rm -f $RESULTS_DIR/${s}.* ; done
 
 # Detecting Session-Id values:
 grep ^sessionid= $RESULTS_DIR/*.metadata 2>/dev/null | cut -d= -f2- | sort -u > $RESULTS_DIR/session-ids