<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18497">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">code cleanup: absorb complete_layer3() into bsc_compl_l3()<br><br>Tweak return code handling: also return a failure code when dispatching the<br>GSCON_EV_A_CONN_REQ event failed.<br><br>Change-Id: I939e8a9a865250033e4837439a6b9ec251e5ce4c<br>---<br>M src/osmo-bsc/gsm_08_08.c<br>1 file changed, 18 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/18497/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index e9918ac..7295f0c 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -55,9 +55,6 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static bool complete_layer3(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, struct bsc_msc_data *msc);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! BTS->MSC: tell MSC a SAPI was not established. */</span><br><span> void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, int dlci)</span><br><span> {</span><br><span>@@ -299,25 +296,6 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! MS->MSC: New MM context with L3 payload. */</span><br><span style="color: hsl(0, 100%, 40%);">-int bsc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, uint16_t chosen_channel)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_msc_data *msc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_INFO, "Tx MSC COMPL L3\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* find the MSC link we want to use */</span><br><span style="color: hsl(0, 100%, 40%);">- msc = bsc_find_msc(conn, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!msc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_ERROR, "Failed to find a MSC for a connection.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_send_ussd_no_srv(conn, msg,</span><br><span style="color: hsl(0, 100%, 40%);">- conn_get_bts(conn)->network->bsc_data->ussd_no_msc_txt);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return complete_layer3(conn, msg, msc) ? 0 : -2;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int handle_page_resp(struct gsm_subscriber_connection *conn, struct msgb *msg)</span><br><span> {</span><br><span> struct bsc_subscr *subscr = extract_sub(conn, msg);</span><br><span>@@ -422,15 +400,29 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static bool complete_layer3(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, struct bsc_msc_data *msc)</span><br><span style="color: hsl(120, 100%, 40%);">+/*! MS->MSC: New MM context with L3 payload. */</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, uint16_t chosen_channel)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc;</span><br><span> struct msgb *resp;</span><br><span> enum bsc_con ret;</span><br><span> struct gsm0808_speech_codec_list scl;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = -2;</span><br><span> </span><br><span> log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_INFO, "Tx MSC COMPL L3\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* find the MSC link we want to use */</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = bsc_find_msc(conn, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "Failed to find a MSC for a connection.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_send_ussd_no_srv(conn, msg,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_get_bts(conn)->network->bsc_data->ussd_no_msc_txt);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto early_fail;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* allocate resource for a new connection */</span><br><span> ret = osmo_bsc_sigtran_new_conn(conn, msc);</span><br><span> </span><br><span>@@ -464,15 +456,12 @@</span><br><span> resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL);</span><br><span> </span><br><span> if (resp)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, resp);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, resp);</span><br><span> else</span><br><span> LOGP(DMSC, LOGL_DEBUG, "Failed to create layer3 message.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- return !!resp;</span><br><span> early_fail:</span><br><span> log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> }</span><br><span> </span><br><span> /*! MS->BSC/MSC: Um L3 message. */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18497">change 18497</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/c/osmo-bsc/+/18497"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I939e8a9a865250033e4837439a6b9ec251e5ce4c </div>
<div style="display:none"> Gerrit-Change-Number: 18497 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>