Change in osmo-ttcn3-hacks[master]: sip: ACK on SIP failure message to avoid it being retransmitted

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258 )


Change subject: sip: ACK on SIP failure message to avoid it being retransmitted
......................................................................

sip: ACK on SIP failure message to avoid it being retransmitted

Otherwise the SIP message is retransmitted by osmo-sip-connector around
10-11 times, even when next test has started, making it fail since it's
not expected.

Change-Id: Icd0f7a7fac4be2aa97eb986c3d3d27dd70a49357
---
M sip/SIP_Tests.ttcn
1 file changed, 23 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/20258/1

diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn
index 534801e..053395e 100644
--- a/sip/SIP_Tests.ttcn
+++ b/sip/SIP_Tests.ttcn
@@ -202,14 +202,23 @@
 	/* OSC <- SIP: A party sends SIP invite for a MT-call into OSC */
 	SIP.send(ts_SIP_INVITE(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm,
 				cp.comp.sip_seq_nr, cp.comp.sip_body));
-	/* MSC <- OSC: OSC generates MNCC_SETUP_REQ from INVITE */
-	MNCC.receive(tr_MNCC_SETUP_req) -> value mncc {
-		cp.mncc_call_id := mncc.u.signal.callref;
-		}
 	/* OSC -> SIP */
 	SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *,
 				    "INVITE", 100, ?, "Trying", *));
 
+	alt {
+	/* MSC <- OSC: OSC generates MNCC_SETUP_REQ from INVITE */
+	[] MNCC.receive(tr_MNCC_SETUP_req) -> value mncc {
+		cp.mncc_call_id := mncc.u.signal.callref;
+		}
+	[] SIP.receive {
+		setverdict(fail, "Received unexpected respose");
+		SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm,
+				    cp.comp.sip_seq_nr, omit));
+		mtc.stop;
+		}
+	}
+
 	/* MSC -> OSC: After MS sends CALL CONF in response to SETUP */
 	MNCC.send(ts_MNCC_CALL_CONF_ind(cp.mncc_call_id));
 	/* MSC <- OSC: OSC asks MSC to create RTP socket */
@@ -223,8 +232,16 @@
 	/* MSC -> OSC: After MS is ringing and sent CC ALERTING */
 	MNCC.send(ts_MNCC_ALERT_ind(cp.mncc_call_id));
 	SIP.clear;
-	SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *,
-				    "INVITE", 180, ?, "Ringing", *));
+	alt {
+	[] SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *,
+				       "INVITE", 180, ?, "Ringing", *));
+	[] SIP.receive {
+		setverdict(fail, "Received unexpected respose");
+		SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm,
+				    cp.comp.sip_seq_nr, omit));
+		mtc.stop;
+		}
+	}
 
 	/* MSC -> OSC: After MT user has picked up and sent CC CONNECT */
 	MNCC.send(ts_MNCC_SETUP_CNF(cp.mncc_call_id));

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20258
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Icd0f7a7fac4be2aa97eb986c3d3d27dd70a49357
Gerrit-Change-Number: 20258
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200923/95694b0b/attachment.htm>