Change in osmo-iuh[master]: ranap_msg_factory: Fix criticality of PDUs

Harald Welte gerrit-no-reply at lists.osmocom.org
Mon Apr 22 08:18:04 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13722 )

Change subject: ranap_msg_factory: Fix criticality of PDUs
......................................................................

ranap_msg_factory: Fix criticality of PDUs

Seveal of our RANAP messages were using criticality values at the
PDU level differing from what RANAP_PDU_Descriptions.asn states
for the respective procedures.  Let's fix that.

This was discovered while working on the initial IuCS TTCN3 tests,
where the receive templates require the criticality to match.

Change-Id: I98eec0bdc0d0cb1b9284bd5d042b1f4403abef95
---
M src/ranap_msg_factory.c
M src/tests/test-ranap.ok
2 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c
index c287f02..2ae2dbf 100644
--- a/src/ranap_msg_factory.c
+++ b/src/ranap_msg_factory.c
@@ -150,7 +150,7 @@
 	}
 
 	msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_InitialUE_Message,
-						RANAP_Criticality_reject,
+						RANAP_Criticality_ignore,
 						&asn_DEF_RANAP_InitialUE_Message,
 						&out);
 
@@ -192,7 +192,7 @@
 
 	/* dt -> msg */
 	msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_DirectTransfer,
-						RANAP_Criticality_reject,
+						RANAP_Criticality_ignore,
 						&asn_DEF_RANAP_DirectTransfer,
 						&dt);
 
@@ -467,7 +467,7 @@
 
 	/* out -> msg */
 	msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_Paging,
-						RANAP_Criticality_reject,
+						RANAP_Criticality_ignore,
 						&asn_DEF_RANAP_Paging,
 						&out);
 
@@ -912,7 +912,7 @@
 
 	/* encode the output into the msgb */
 	msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_Iu_ReleaseRequest,
-						RANAP_Criticality_reject,
+						RANAP_Criticality_ignore,
 						&asn_DEF_RANAP_Iu_ReleaseRequest, &out);
 
 	ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_Iu_ReleaseRequest, &out);
@@ -955,7 +955,7 @@
 
 	/* encode the output into the msgb */
 	msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_RAB_ReleaseRequest,
-						RANAP_Criticality_reject,
+						RANAP_Criticality_ignore,
 						&asn_DEF_RANAP_RAB_ReleaseRequest, &out);
 
 	ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_ReleaseRequest, &out);
diff --git a/src/tests/test-ranap.ok b/src/tests/test-ranap.ok
index 2a8de8f..a0ea521 100644
--- a/src/tests/test-ranap.ok
+++ b/src/tests/test-ranap.ok
@@ -23,7 +23,7 @@
     <criticality><ignore/></criticality>
     <value>00</value>
 </RANAP_IE>
-00 14 00 10 00 00 02 00 10 40 04 03 aa bb cc 00 3b 40 01 00 
+00 14 40 10 00 00 02 00 10 40 04 03 aa bb cc 00 3b 40 01 00 
 
 ==> SECURITY MODE COMMAND
 <RANAP_IE>
@@ -81,7 +81,7 @@
     <criticality><ignore/></criticality>
     <value>00 01 23 45 67</value>
 </RANAP_IE>
-00 0e 00 1e 00 00 03 00 03 40 01 00 00 17 40 09 50 09 71 00 21 43 65 87 f9 00 40 40 05 00 01 23 45 67 
+00 0e 40 1e 00 00 03 00 03 40 01 00 00 17 40 09 50 09 71 00 21 43 65 87 f9 00 40 40 05 00 01 23 45 67 
 
 ==> RAB ASSIGNMENT COMMAND (VOICE)
 <RANAP_ProtocolIE-FieldPair>
@@ -194,7 +194,7 @@
     <criticality><ignore/></criticality>
     <value>09 01 99 09 26</value>
 </RANAP_IE>
-00 13 00 36 00 00 06 00 03 40 01 00 00 0f 40 06 00 09 01 99 42 23 00 3a 40 08 00 09 01 99 42 23 42 23 00 10 40 04 03 aa bb cc 00 4f 40 03 00 00 17 00 56 40 05 09 01 99 09 26 
+00 13 40 36 00 00 06 00 03 40 01 00 00 0f 40 06 00 09 01 99 42 23 00 3a 40 08 00 09 01 99 42 23 42 23 00 10 40 04 03 aa bb cc 00 4f 40 03 00 00 17 00 56 40 05 09 01 99 09 26 
 
 ==> IU RELEASE REQ
 <RANAP_IE>
@@ -202,7 +202,7 @@
     <criticality><ignore/></criticality>
     <value>0B 40</value>
 </RANAP_IE>
-00 0b 00 09 00 00 01 00 04 40 02 0b 40 
+00 0b 40 09 00 00 01 00 04 40 02 0b 40 
 
 ==> RAB RELEASE REQ
 <RANAP_IE>
@@ -215,7 +215,7 @@
     <criticality><ignore/></criticality>
     <value>00 00 01 00 28 40 03 05 C2 D0</value>
 </RANAP_IE>
-00 0a 00 11 00 00 01 00 29 40 0a 00 00 01 00 28 40 03 05 c2 d0 
+00 0a 40 11 00 00 01 00 29 40 0a 00 00 01 00 28 40 03 05 c2 d0 
 report
 talloc report on 'asn1_context' (total      0 bytes in   1 blocks)
 talloc report on 'msgb' (total      0 bytes in   1 blocks)

-- 
To view, visit https://gerrit.osmocom.org/13722
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I98eec0bdc0d0cb1b9284bd5d042b1f4403abef95
Gerrit-Change-Number: 13722
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190422/7fcfdd0e/attachment.html>


More information about the gerrit-log mailing list