local adml_type=$4
local wait_command=waitfe
+ # wait xml variant:
+ local waitxml_command=waitfe-xml
local send_command=sendxml2e
- [ "$adml_type" = "server" ] && { wait_command=waitfc ; send_command=sendxml2c ; }
+ [ "$adml_type" = "server" ] && { wait_command=waitfc ; waitxml_command=waitfc-xml ; send_command=sendxml2c ; }
# Ignore disconnect peer messages on testcase format (they have no session-id):
local lines=$(wc -l $TESTCASE_BN | awk '{ print $1 }')
local s_wait="test|1|$wait_command|$code|$((1-isrequest))"
+ # wait xml variant:
+ local s_waitxml="test|1|$waitxml_command|$xml"
[ -n "$sessionid" ] && s_wait="${s_wait}|||${sessionid}"
local s_send="test|1|$send_command|$xml"
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
# Wait the answer:
s_wait="${s_wait}|${rc}"
fi
- echo "$s_wait" >> $TESTCASE_BN
+ echo "$s_waitxml" >> $TESTCASE_BN
+ echo "#$s_wait" >> $TESTCASE_BN
else
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
echo $oh >> cers_4_starting_origin_hosts
echo "Missing CER: `basename $cer` (a basic template has been created, please edit & fix the unknowns)"
cat << EOF > $cer
-<message version="1" name="CER" application-id="0" hop-by-hop-id="1" end-by-end-id="1">
+<message version="1" name="CER" application-id="0" hop-by-hop-id="1" end-to-end-id="1">
<avp name="Origin-Host" data="$oh"/>
<avp name="Origin-Realm" data="$(echo $oh | cut -d\. -f2-) $WHAT"/>
<avp name="Auth-Application-Id" data="16777236 $WHAT 16777238 $WHAT"/>
echo $oh >> ceas_4_establishing_origin_hosts
echo "Missing CEA: `basename $cea` (a basic template has been created, please edit & fix the unknowns)"
cat << EOF > $cea
-<message version="1" name="CEA" application-id="0" hop-by-hop-id="1" end-by-end-id="1">
+<message version="1" name="CEA" application-id="0" hop-by-hop-id="1" end-to-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"/>