<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13934">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">comment: apply function renames to message cycle explanation<br><br>The misnomed 'nas_decode' and 'nas_encode' APIs have been renamed to<br>'ran_decode' and 'ran_encode', which was forgotten in the large comment<br>explaining the message path in sccp_ran.h. Apply the rename there.<br><br>Change-Id: I742fb4844ac8a9ad76f59883ae9447eb8819b82d<br>---<br>M include/osmocom/msc/sccp_ran.h<br>1 file changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/sccp_ran.h b/include/osmocom/msc/sccp_ran.h</span><br><span>index b7da314..f190d91 100644</span><br><span>--- a/include/osmocom/msc/sccp_ran.h</span><br><span>+++ b/include/osmocom/msc/sccp_ran.h</span><br><span>@@ -13,17 +13,17 @@</span><br><span> * msc_a_up_l3() msc_a_tx_dtap_to_i(dtap_msgb)</span><br><span> * ^ |</span><br><span> * | v</span><br><span style="color: hsl(0, 100%, 40%);">- * msc_a_nas_decode_cb(struct nas_dec_msg) msc_a_nas_enc(struct nas_enc_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ * msc_a_ran_decode_cb(struct ran_dec_msg) msc_a_ran_enc(struct ran_enc_msg)</span><br><span> * ^ ^ . |</span><br><span> * | -Decode NAS- | . NAS v</span><br><span style="color: hsl(0, 100%, 40%);">- * | | . ran_infra[type]->nas_encode(struct nas_enc_msg)</span><br><span style="color: hsl(0, 100%, 40%);">- * nas_a_decode_l2() nas_iu_decode_l2() . | |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | | . ran_infra[type]->ran_encode(struct ran_enc_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ * ran_a_decode_l2() ran_iu_decode_l2() . | |</span><br><span> * ^ ^ . v v</span><br><span style="color: hsl(0, 100%, 40%);">- * | | . nas_a_encode() nas_iu_encode()</span><br><span style="color: hsl(0, 100%, 40%);">- * ran_infra[type]->nas_dec_l2() | |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | | . ran_a_encode() ran_iu_encode()</span><br><span style="color: hsl(120, 100%, 40%);">+ * ran_infra[type]->ran_dec_l2() | |</span><br><span> * ^ | -Encode BSSAP/RANAP- |</span><br><span> * | v v</span><br><span style="color: hsl(0, 100%, 40%);">- * msc_a_nas_dec() msub_tx_an_apdu(from MSC_ROLE_A to MSC_ROLE_I)</span><br><span style="color: hsl(120, 100%, 40%);">+ * msc_a_ran_dec() msub_tx_an_apdu(from MSC_ROLE_A to MSC_ROLE_I)</span><br><span> * ^ |</span><br><span> * | MSC-A v</span><br><span> * . msc_a FSM . . . . . . . . . . . . . . . . msc_a FSM . . . . . . . . . .</span><br><span>@@ -78,12 +78,12 @@</span><br><span> *</span><br><span> * MSC-A:</span><br><span> * - Receives MSC_A_EV_FROM_I_COMPLETE_LAYER_3 AN-APDU, notices an_proto indicating BSSAP or RANAP.</span><br><span style="color: hsl(0, 100%, 40%);">- * - Passes L2 message to ran_infra[]->nas_dec_l2(), which decodes the BSSAP or RANAP.</span><br><span style="color: hsl(0, 100%, 40%);">- * - contained information is passed to msc_a_nas_decode_cb().</span><br><span style="color: hsl(120, 100%, 40%);">+ * - Passes L2 message to ran_infra[]->ran_dec_l2(), which decodes the BSSAP or RANAP.</span><br><span style="color: hsl(120, 100%, 40%);">+ * - contained information is passed to msc_a_ran_decode_cb().</span><br><span> * - which msc_a starts Complete-L3 and VLR procedures,</span><br><span> * - associates msub with a vlr_subscr,</span><br><span> * - sends DTAP requests back down by calling msc_a_tx_dtap_to_i() (possibly other more specialized tx functions)</span><br><span style="color: hsl(0, 100%, 40%);">- * - according to ran_infra[]->nas_encode(), the nas_enc_msg gets encoded as BSSAP or RANAP.</span><br><span style="color: hsl(120, 100%, 40%);">+ * - according to ran_infra[]->ran_encode(), the ran_enc_msg gets encoded as BSSAP or RANAP.</span><br><span> * - passes as AN-APDU to MSC-I in MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST signal.</span><br><span> *</span><br><span> * MSC-I, receiving AN-APDU from local MSC-A:</span><br><span>@@ -147,10 +147,10 @@</span><br><span> *</span><br><span> * MSC-A role:</span><br><span> * - Receives MSC_A_EV_FROM_I_PROCESS_ACCESS_SIGNALLING_REQUEST, notices an_proto indicating BSSAP or RANAP.</span><br><span style="color: hsl(0, 100%, 40%);">- * - Passes L2 message to ran_infra[]->nas_dec_l2(), which decodes the BSSAP or RANAP.</span><br><span style="color: hsl(0, 100%, 40%);">- * - contained information is passed to msc_a_nas_decode_cb().</span><br><span style="color: hsl(120, 100%, 40%);">+ * - Passes L2 message to ran_infra[]->ran_dec_l2(), which decodes the BSSAP or RANAP.</span><br><span style="color: hsl(120, 100%, 40%);">+ * - contained information is passed to msc_a_ran_decode_cb().</span><br><span> * - sends DTAP requests back down by calling msc_a_tx_dtap_to_i() (possibly other more specialized tx functions)</span><br><span style="color: hsl(0, 100%, 40%);">- * - according to ran_infra[]->nas_encode(), the nas_enc_msg gets encoded as BSSAP or RANAP.</span><br><span style="color: hsl(120, 100%, 40%);">+ * - according to ran_infra[]->ran_encode(), the ran_enc_msg gets encoded as BSSAP or RANAP.</span><br><span> * - passes as AN-APDU to MSC-I in MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST signal.</span><br><span> *</span><br><span> * MSC-I-Remote:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13934">change 13934</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/13934"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I742fb4844ac8a9ad76f59883ae9447eb8819b82d </div>
<div style="display:none"> Gerrit-Change-Number: 13934 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>