<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13722">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ranap_msg_factory: Fix criticality of PDUs<br><br>Seveal of our RANAP messages were using criticality values at the<br>PDU level differing from what RANAP_PDU_Descriptions.asn states<br>for the respective procedures. Let's fix that.<br><br>This was discovered while working on the initial IuCS TTCN3 tests,<br>where the receive templates require the criticality to match.<br><br>Change-Id: I98eec0bdc0d0cb1b9284bd5d042b1f4403abef95<br>---<br>M src/ranap_msg_factory.c<br>M src/tests/test-ranap.ok<br>2 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c</span><br><span>index c287f02..2ae2dbf 100644</span><br><span>--- a/src/ranap_msg_factory.c</span><br><span>+++ b/src/ranap_msg_factory.c</span><br><span>@@ -150,7 +150,7 @@</span><br><span> }</span><br><span> </span><br><span> msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_InitialUE_Message,</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_Criticality_reject,</span><br><span style="color: hsl(120, 100%, 40%);">+ RANAP_Criticality_ignore,</span><br><span> &asn_DEF_RANAP_InitialUE_Message,</span><br><span> &out);</span><br><span> </span><br><span>@@ -192,7 +192,7 @@</span><br><span> </span><br><span> /* dt -> msg */</span><br><span> msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_DirectTransfer,</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_Criticality_reject,</span><br><span style="color: hsl(120, 100%, 40%);">+ RANAP_Criticality_ignore,</span><br><span> &asn_DEF_RANAP_DirectTransfer,</span><br><span> &dt);</span><br><span> </span><br><span>@@ -467,7 +467,7 @@</span><br><span> </span><br><span> /* out -> msg */</span><br><span> msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_Paging,</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_Criticality_reject,</span><br><span style="color: hsl(120, 100%, 40%);">+ RANAP_Criticality_ignore,</span><br><span> &asn_DEF_RANAP_Paging,</span><br><span> &out);</span><br><span> </span><br><span>@@ -912,7 +912,7 @@</span><br><span> </span><br><span> /* encode the output into the msgb */</span><br><span> msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_Iu_ReleaseRequest,</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_Criticality_reject,</span><br><span style="color: hsl(120, 100%, 40%);">+ RANAP_Criticality_ignore,</span><br><span> &asn_DEF_RANAP_Iu_ReleaseRequest, &out);</span><br><span> </span><br><span> ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_Iu_ReleaseRequest, &out);</span><br><span>@@ -955,7 +955,7 @@</span><br><span> </span><br><span> /* encode the output into the msgb */</span><br><span> msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_RAB_ReleaseRequest,</span><br><span style="color: hsl(0, 100%, 40%);">- RANAP_Criticality_reject,</span><br><span style="color: hsl(120, 100%, 40%);">+ RANAP_Criticality_ignore,</span><br><span> &asn_DEF_RANAP_RAB_ReleaseRequest, &out);</span><br><span> </span><br><span> ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_ReleaseRequest, &out);</span><br><span>diff --git a/src/tests/test-ranap.ok b/src/tests/test-ranap.ok</span><br><span>index 2a8de8f..a0ea521 100644</span><br><span>--- a/src/tests/test-ranap.ok</span><br><span>+++ b/src/tests/test-ranap.ok</span><br><span>@@ -23,7 +23,7 @@</span><br><span> <criticality><ignore/></criticality></span><br><span> <value>00</value></span><br><span> </RANAP_IE></span><br><span style="color: hsl(0, 100%, 40%);">-00 14 00 10 00 00 02 00 10 40 04 03 aa bb cc 00 3b 40 01 00 </span><br><span style="color: hsl(120, 100%, 40%);">+00 14 40 10 00 00 02 00 10 40 04 03 aa bb cc 00 3b 40 01 00 </span><br><span> </span><br><span> ==> SECURITY MODE COMMAND</span><br><span> <RANAP_IE></span><br><span>@@ -81,7 +81,7 @@</span><br><span> <criticality><ignore/></criticality></span><br><span> <value>00 01 23 45 67</value></span><br><span> </RANAP_IE></span><br><span style="color: hsl(0, 100%, 40%);">-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 </span><br><span style="color: hsl(120, 100%, 40%);">+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 </span><br><span> </span><br><span> ==> RAB ASSIGNMENT COMMAND (VOICE)</span><br><span> <RANAP_ProtocolIE-FieldPair></span><br><span>@@ -194,7 +194,7 @@</span><br><span> <criticality><ignore/></criticality></span><br><span> <value>09 01 99 09 26</value></span><br><span> </RANAP_IE></span><br><span style="color: hsl(0, 100%, 40%);">-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 </span><br><span style="color: hsl(120, 100%, 40%);">+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 </span><br><span> </span><br><span> ==> IU RELEASE REQ</span><br><span> <RANAP_IE></span><br><span>@@ -202,7 +202,7 @@</span><br><span> <criticality><ignore/></criticality></span><br><span> <value>0B 40</value></span><br><span> </RANAP_IE></span><br><span style="color: hsl(0, 100%, 40%);">-00 0b 00 09 00 00 01 00 04 40 02 0b 40 </span><br><span style="color: hsl(120, 100%, 40%);">+00 0b 40 09 00 00 01 00 04 40 02 0b 40 </span><br><span> </span><br><span> ==> RAB RELEASE REQ</span><br><span> <RANAP_IE></span><br><span>@@ -215,7 +215,7 @@</span><br><span> <criticality><ignore/></criticality></span><br><span> <value>00 00 01 00 28 40 03 05 C2 D0</value></span><br><span> </RANAP_IE></span><br><span style="color: hsl(0, 100%, 40%);">-00 0a 00 11 00 00 01 00 29 40 0a 00 00 01 00 28 40 03 05 c2 d0 </span><br><span style="color: hsl(120, 100%, 40%);">+00 0a 40 11 00 00 01 00 29 40 0a 00 00 01 00 28 40 03 05 c2 d0 </span><br><span> report</span><br><span> talloc report on 'asn1_context' (total 0 bytes in 1 blocks)</span><br><span> talloc report on 'msgb' (total 0 bytes in 1 blocks)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13722">change 13722</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13722"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-iuh </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I98eec0bdc0d0cb1b9284bd5d042b1f4403abef95 </div>
<div style="display:none"> Gerrit-Change-Number: 13722 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>