Change in osmo-msc[master]: msc_a: add callref as call id to ASSIGNMENT REQ.

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18692 )

Change subject: msc_a: add callref as call id to ASSIGNMENT REQ.
......................................................................

msc_a: add callref as call id to ASSIGNMENT REQ.

The BSSMAP message ASSIGNMENT REQUEST may contain an optional CALL
IDENTIFIER IE. While this IE is optional some BSC implementions may
require it.

Change-Id: I4288f47e4a6d61ec672f431723f6e72c7c6b0799
Related: OS#4582
---
M include/osmocom/msc/ran_msg.h
M src/libmsc/msc_a.c
M src/libmsc/ran_msg_a.c
3 files changed, 9 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h
index 1b0e2e8..3b08b46 100644
--- a/include/osmocom/msc/ran_msg.h
+++ b/include/osmocom/msc/ran_msg.h
@@ -86,6 +86,8 @@
 	enum nsap_addr_enc rab_assign_addr_enc;
 	bool osmux_present;
 	uint8_t osmux_cid;
+	bool call_id_present;
+	uint32_t call_id;
 };
 
 struct ran_cipher_mode_command {
diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index 4d856d0..3bfc0f8 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -541,6 +541,8 @@
 			.channel_type = &channel_type,
 			.osmux_present = msc_a->cc.call_leg->rtp[RTP_TO_RAN]->use_osmux,
 			.osmux_cid = msc_a->cc.call_leg->rtp[RTP_TO_RAN]->local_osmux_cid,
+			.call_id_present = true,
+			.call_id = cc_trans->callref,
 		},
 	};
 	if (msc_a_ran_down(msc_a, MSC_ROLE_I, &msg)) {
diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c
index 28f99ce..e6dee52 100644
--- a/src/libmsc/ran_msg_a.c
+++ b/src/libmsc/ran_msg_a.c
@@ -959,6 +959,7 @@
 	struct sockaddr_storage rtp_addr;
 	struct sockaddr_storage *use_rtp_addr = NULL;
 	struct msgb *msg;
+	const uint32_t *call_id = NULL;
 	int rc;
 
 	if (!ac->channel_type) {
@@ -999,7 +1000,10 @@
 		}
 	}
 
-	msg = gsm0808_create_ass(ac->channel_type, NULL, use_rtp_addr, use_scl, NULL);
+	if(ac->call_id_present == true)
+		call_id = &ac->call_id;
+
+	msg = gsm0808_create_ass(ac->channel_type, NULL, use_rtp_addr, use_scl, call_id);
 	if (ac->osmux_present)
 		_gsm0808_assignment_extend_osmux(msg, ac->osmux_cid);
 	return msg;

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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I4288f47e4a6d61ec672f431723f6e72c7c6b0799
Gerrit-Change-Number: 18692
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200622/9c85ebc8/attachment.htm>