Change in ...osmo-ttcn3-hacks[master]: library/RAN_Emulation.ttcnpp: fix: properly handle SAPI / DLCI for RANAP

laforge gerrit-no-reply at lists.osmocom.org
Thu Jun 20 16:51:37 UTC 2019


laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14551 )

Change subject: library/RAN_Emulation.ttcnpp: fix: properly handle SAPI / DLCI for RANAP
......................................................................

library/RAN_Emulation.ttcnpp: fix: properly handle SAPI / DLCI for RANAP

Some of our SMS related test cases are failing. The problem is
that SMS related RAN messages shall be sent on SAPI 3, as per
GSM TS 04.11, section 2.3, while they actually being sent on
SAPI 0.

For the messages coming from the TCs towards OsmoMSC over RANAP,
we need to convert from DLCI to SAPI in f_xmit_raw_l3(). OsmoMSC
also needs to be patched, because it seems to ignore SAPI IE.

Change-Id: I6199fd5f26774fb1ec419bc1ef9e1caeca3a0d35
---
M library/RAN_Emulation.ttcnpp
1 file changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index b41d7eb..207adcd 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -1096,9 +1096,15 @@
 #endif
 #ifdef RAN_EMULATION_RANAP
 	case (RAN_PROTOCOL_RANAP) {
+		var template (omit) RANAP_IEs.SAPI sapi := omit;
 		var RANAP_PDU ranap;
-		/* FIXME: convert DLCI into SAPI */
-		ranap := valueof(ts_RANAP_DirectTransfer(l3_enc));
+
+		/* Perform DLCI -> SAPI transformation (x & 0x07) */
+		if (dlci and4b '07'O == '03'O) {
+			sapi := sapi_3;
+		}
+
+		ranap := valueof(ts_RANAP_DirectTransfer(l3_enc, sapi := sapi));
 		RANAP.send(ts_RANAP_DATA_req(sccp_conn_id, ranap));
 		}
 #endif

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14551
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: I6199fd5f26774fb1ec419bc1ef9e1caeca3a0d35
Gerrit-Change-Number: 14551
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190620/27b16fb0/attachment.html>


More information about the gerrit-log mailing list