<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12029">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Vadim Yanitskiy: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drop msc_compl_l3() return value<br><br>msc_compl_l3() always returns MSC_CONN_ACCEPT, because the conn FSM handles (or<br>should handle) all reject cases. The accept/reject return value is a legacy<br>from libbsc internally passing a conn over to libmsc, in osmo-nitb.<br><br>Drop enum msc_compl_l3_rc.<br>Change msc_compl_l3_rc() to return void.<br>Change all callers to always act like for acceptance, as they always did anyway.<br>Drop some local variables now no longer needed.<br>Adjust the comment to msc_compl_l3().<br>Drop a bunch of #if-0'd code from msc_compl_l3().<br><br>Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09<br>---<br>M include/osmocom/msc/osmo_msc.h<br>M src/libmsc/a_iface_bssap.c<br>M src/libmsc/iucs.c<br>M src/libmsc/osmo_msc.c<br>4 files changed, 11 insertions(+), 51 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h</span><br><span>index ad81da5..674de3b 100644</span><br><span>--- a/include/osmocom/msc/osmo_msc.h</span><br><span>+++ b/include/osmocom/msc/osmo_msc.h</span><br><span>@@ -40,11 +40,6 @@</span><br><span> SUBSCR_CONN_S_RELEASED,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum msc_compl_l3_rc {</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_ACCEPT = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_REJECT = 1,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct gsm_subscriber_connection *msc_subscr_conn_alloc(struct gsm_network *network,</span><br><span> enum ran_type via_ran, uint16_t lac);</span><br><span> </span><br><span>@@ -59,8 +54,8 @@</span><br><span> </span><br><span> void msc_sapi_n_reject(struct gsm_subscriber_connection *conn, int dlci);</span><br><span> int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause);</span><br><span style="color: hsl(0, 100%, 40%);">-int msc_compl_l3(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, uint16_t chosen_channel);</span><br><span style="color: hsl(120, 100%, 40%);">+void msc_compl_l3(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg, uint16_t chosen_channel);</span><br><span> void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg);</span><br><span> int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka,</span><br><span> bool retrieve_imeisv);</span><br><span>diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c</span><br><span>index 9a2333d..77d84b3 100644</span><br><span>--- a/src/libmsc/a_iface_bssap.c</span><br><span>+++ b/src/libmsc/a_iface_bssap.c</span><br><span>@@ -260,8 +260,6 @@</span><br><span> uint16_t lac = 0;</span><br><span> uint8_t data_length;</span><br><span> const uint8_t *data;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct gsm_network *network = a_conn_info->network;</span><br><span> struct gsm_subscriber_connection *conn;</span><br><span> </span><br><span>@@ -345,17 +343,8 @@</span><br><span> conn = subscr_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id);</span><br><span> </span><br><span> /* Handover location update to the MSC code */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = msc_compl_l3(conn, msg, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == MSC_CONN_ACCEPT) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_INFO, "User has been accepted by MSC.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (rc == MSC_CONN_REJECT)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_INFO, "User has been rejected by MSC.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_INFO, "User has been rejected by MSC (unknown error)\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_compl_l3(conn, msg, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* Endpoint to handle BSSMAP classmark update */</span><br><span>diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c</span><br><span>index 95bbbee..c3fea0d 100644</span><br><span>--- a/src/libmsc/iucs.c</span><br><span>+++ b/src/libmsc/iucs.c</span><br><span>@@ -142,7 +142,6 @@</span><br><span> int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg,</span><br><span> uint16_t *lac)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span> struct ranap_ue_conn_ctx *ue_ctx;</span><br><span> struct gsm_subscriber_connection *conn;</span><br><span> </span><br><span>@@ -174,7 +173,6 @@</span><br><span> OSMO_ASSERT(pdisc != GSM48_PDISC_RR);</span><br><span> </span><br><span> msc_dtap(conn, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span> } else {</span><br><span> /* allocate a new connection */</span><br><span> </span><br><span>@@ -191,10 +189,10 @@</span><br><span> abort();</span><br><span> </span><br><span> /* ownership of conn hereby goes to the MSC: */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = msc_compl_l3(conn, msg, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_compl_l3(conn, msg, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> int iu_rab_act_cs(struct gsm_trans *trans)</span><br><span>diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c</span><br><span>index 88a3dbb..05ac845 100644</span><br><span>--- a/src/libmsc/osmo_msc.c</span><br><span>+++ b/src/libmsc/osmo_msc.c</span><br><span>@@ -87,37 +87,15 @@</span><br><span> gsm411_sapi_n_reject(conn);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* receive a Level 3 Complete message and return MSC_CONN_ACCEPT or</span><br><span style="color: hsl(0, 100%, 40%);">- * MSC_CONN_REJECT */</span><br><span style="color: hsl(0, 100%, 40%);">-int msc_compl_l3(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, uint16_t chosen_channel)</span><br><span style="color: hsl(120, 100%, 40%);">+/* receive a Level 3 Complete message.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Ownership of the conn is completely passed to the conn FSM, i.e. for both acceptance and rejection,</span><br><span style="color: hsl(120, 100%, 40%);">+ * the conn FSM shall decide when to release this conn. It may already be discarded before this exits. */</span><br><span style="color: hsl(120, 100%, 40%);">+void msc_compl_l3(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg, uint16_t chosen_channel)</span><br><span> {</span><br><span> msc_subscr_conn_get(conn, MSC_CONN_USE_COMPL_L3);</span><br><span> gsm0408_dispatch(conn, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> msc_subscr_conn_put(conn, MSC_CONN_USE_COMPL_L3);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Always return acceptance, because even if the conn was not accepted,</span><br><span style="color: hsl(0, 100%, 40%);">- * we assumed ownership of it and the caller shall not interfere with</span><br><span style="color: hsl(0, 100%, 40%);">- * that. We may even already have discarded the conn. */</span><br><span style="color: hsl(0, 100%, 40%);">- return MSC_CONN_ACCEPT;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * If this is a silent call we want the channel to remain open as long as</span><br><span style="color: hsl(0, 100%, 40%);">- * possible and this is why we accept this connection regardless of any</span><br><span style="color: hsl(0, 100%, 40%);">- * pending transaction or ongoing operation.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- if (conn->silent_call)</span><br><span style="color: hsl(0, 100%, 40%);">- return MSC_CONN_ACCEPT;</span><br><span style="color: hsl(0, 100%, 40%);">- if (conn->loc_operation || conn->sec_operation || conn->anch_operation)</span><br><span style="color: hsl(0, 100%, 40%);">- return MSC_CONN_ACCEPT;</span><br><span style="color: hsl(0, 100%, 40%);">- if (trans_has_conn(conn))</span><br><span style="color: hsl(0, 100%, 40%);">- return MSC_CONN_ACCEPT;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRR, LOGL_INFO, "MSC Complete L3: Rejecting connection.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return MSC_CONN_REJECT;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> }</span><br><span> </span><br><span> /* Receive a DTAP message from BSC */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12029">change 12029</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/12029"/><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: I759d15f4e820d5fc16397ed7210ce92308e52a09 </div>
<div style="display:none"> Gerrit-Change-Number: 12029 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>