[MERGED] osmo-ttcn3-hacks[master]: bsc: Reply to CRCX with ACK

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc: Reply to CRCX with ACK
......................................................................


bsc: Reply to CRCX with ACK

Change-Id: Ieaea431a99241d8844b915e1b46b77c79fff24df
---
M bsc/MSC_ConnectionHandler.ttcn
M library/MGCP_Emulation.ttcn
2 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index e1fd35a..f763994 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -154,6 +154,7 @@
 runs on MSC_ConnHdlr return PDU_BSSAP {
 	var PDU_BSSAP bssap;
 	var RSL_Message rsl;
+	var MgcpCommand cmd;
 	timer T := 10.0;
 	var boolean exp_compl := ischosen(exp_ass_cpl.pdu.bssmap.assignmentComplete);
 	var boolean crcx_seen := false;
@@ -164,6 +165,7 @@
 		transid := omit
 	};
 
+	mgcp_conn_id := f_mgcp_alloc_conn_id();
 	f_create_chan_and_exp(pars);
 	/* we should now have a COMPL_L3 at the MSC */
 
@@ -171,6 +173,9 @@
 	f_create_mgcp_expect(mgcpcrit);
 	BSSAP.send(ass_cmd);
 	alt {
+	[] MGCP.receive(tr_CRCX) -> value cmd {
+		MGCP.send(ts_CRCX_ACK(cmd.line.trans_id, mgcp_conn_id, cmd.sdp))
+		}
 	/* if we receive exactly what we expected, always return + pass */
 	[] BSSAP.receive(exp_ass_cpl) -> value bssap {
 		setverdict(pass);
diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn
index df8e4b4..074385c 100644
--- a/library/MGCP_Emulation.ttcn
+++ b/library/MGCP_Emulation.ttcn
@@ -38,6 +38,7 @@
 	port MGCP_Conn_PT MGCP;
 	/* procedure based port to register for incoming connections */
 	port MGCPEM_PROC_PT MGCP_PROC;
+	var MgcpConnectionId mgcp_conn_id;
 }
 
 /* port between individual per-connection components and this dispatcher */

-- 
To view, visit https://gerrit.osmocom.org/6168
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaea431a99241d8844b915e1b46b77c79fff24df
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>