Fix CEA scenaries

diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase.sh b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
index 1f77c95..cf4f4cd 100755 (executable)
--- a/example/diameter/launcher/resources/scripts/tinyTestcase.sh
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
@@ -186,7 +186,9 @@ ls *.needed >/dev/null 2>/dev/null
 
 # Messages classification:
 0> cers_4_starting
+0> ceas_4_establishing
 0> cers_4_starting_origin_hosts
+0> ceas_4_establishing_origin_hosts
 0> requests_4_sending
 0> answers_4_programming
 0> $TESTCASE_BN
@@ -210,6 +212,7 @@ do
   grep -q "^isrequest=1$" $mtd
   if [ $? -eq 0 ]
   then
+    # CER's:
     grep -q "^code=257$" $mtd
     if [ $? -eq 0 ]
     then
@@ -220,12 +223,22 @@ do
       ln -sf $xml cer.${originHost}.xml
       continue
     fi
+    # Other requests:
     echo $frame >> requests_4_sending
     update_testcase $mtd $xml check_result_code
   else
-    # Ignore CEA's:
+    # CEA's:
     grep -q "^code=257$" $mtd
-    [ $? -eq 0 ] && continue
+    if [ $? -eq 0 ]
+    then
+      echo $frame >> ceas_4_establishing
+      originHost=$(getOriginHost $xml)
+      [ -z "$originHost" ] &&  _exit "Missing Origin-Host (frame $frame, CEA message) !!"
+      echo "$originHost" >> ceas_4_establishing_origin_hosts
+      ln -sf $xml cer.${originHost}.xml
+      continue
+    fi
+    # Other answers:
     echo $frame >> answers_4_programming
     update_testcase $mtd $xml
   fi
@@ -266,7 +279,7 @@ then
     do
       cer_file=cer.${oh}.xml
       touch $cer_file
-      echo "WARNING: you must configure '$cer_file' because it is missing in the pcap file provided."
+      echo "WARNING: perhaps you should configure '$cer_file' because it is missing in the pcap file provided."
       echo "         Currently it contains a basic template but you must fill/fix the unknowns '$WHAT'."
       cat << EOF > $cer_file
 <message version="1" name="CER" application-id="0" hop-by-hop-id="1" end-by-end-id="1">
@@ -286,5 +299,46 @@ EOF
   fi
 fi
 
+# PCAPs without CEA messages ...
+if [ ! -s ceas_4_establishing_origin_hosts ]
+then
+  if [ $n_involved -ne 0 ]
+  then 
+    grep "<avp name=\"Origin-Host\"" $involved_xmls | cut -d\" -f4 | sort -u > ceas_4_establishing_origin_hosts
+    for oh in `cat ceas_4_establishing_origin_hosts`
+    do
+      cea_file=cea.${oh}.xml
+      touch $cea_file
+      echo "WARNING: perhaps you should configure '$cea_file' because it is missing in the pcap file provided."
+      echo "         Currently it contains a basic template but you must fill/fix the unknowns '$WHAT'."
+      cat << EOF > $cea_file
+<message version="1" name="CEA" application-id="0" hop-by-hop-id="1" end-by-end-id="1">
+   <avp name="Result-Code" data="2001" alias="DIAMETER_SUCCESS"/>
+   <avp name="Origin-Host" data="$oh"/>
+   <avp name="Origin-Realm" data="$(echo $oh | cut -d\. -f2-) $WHAT"/>
+   <avp name="Host-IP-Address" data="1|192.168.12.42 $WHAT"/>
+   <avp name="Vendor-Id" data="193"/>
+   <avp name="Product-Name" data="SAPC"/>
+   <avp name="Supported-Vendor-Id" data="5535"/>
+   <avp name="Supported-Vendor-Id" data="10415"/>
+   <avp name="Auth-Application-Id" data="16777238"/>
+   <avp name="Auth-Application-Id" data="16777236"/>
+   <avp name="Vendor-Specific-Application-Id">
+      <avp name="Vendor-Id" data="10415"/>
+      <avp name="Auth-Application-Id" data="16777238"/>
+   </avp>
+   <avp name="Vendor-Specific-Application-Id">
+      <avp name="Vendor-Id" data="10415"/>
+      <avp name="Auth-Application-Id" data="16777236"/>
+   </avp>
+   <avp name="Firmware-Revision" data="1"/>
+</message>
+EOF
+    done
+  #else
+  #  echo "WARNING: No 'sendxml' primitives on testcase ??"
+  fi
+fi
+
 exit 0