<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20343">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">compl l3: allocate conn in gsm_08_08.c, not gsm_04_08_rr.c<br><br>Move conn allocation to bsc_compl_l3(), from gsm0408_rcvmsg().<br><br>Drop dispatch of GSCON_EV_A_DISC_IND, because a) we did not receive such<br>DISC.IND, and b) the lchan release will discard the conn in the regular<br>fashion.<br><br>In upcoming LCS patch, bsc_compl_l3() will decide whether to allocate a new<br>conn or whether a conn from a Perform Location Request already exists for the<br>subscriber.<br><br>In this patch, it becomes clear that the conn->bsub is always NULL in<br>bsc_compl_l3(), and that the 'log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);'<br>never has the intended effect. An upcoming patch will change that.<br><br>Change-Id: I92af0f0d54c4282d782f2b29d524a64006c3b674<br>---<br>M include/osmocom/bsc/gsm_08_08.h<br>M src/osmo-bsc/gsm_04_08_rr.c<br>M src/osmo-bsc/gsm_08_08.c<br>M tests/bsc/bsc_test.c<br>M tests/gsm0408/gsm0408_test.c<br>M tests/handover/handover_test.c<br>6 files changed, 23 insertions(+), 21 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/43/20343/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_08_08.h b/include/osmocom/bsc/gsm_08_08.h</span><br><span>index 80da297..da5e2f1 100644</span><br><span>--- a/include/osmocom/bsc/gsm_08_08.h</span><br><span>+++ b/include/osmocom/bsc/gsm_08_08.h</span><br><span>@@ -8,7 +8,7 @@</span><br><span> </span><br><span> void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause);</span><br><span> void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr);</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(120, 100%, 40%);">+int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel);</span><br><span> void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg);</span><br><span> void bsc_cm_update(struct gsm_subscriber_connection *conn,</span><br><span> const uint8_t *cm2, uint8_t cm2_len,</span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index a7bba0d..49ec848 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -1015,7 +1015,6 @@</span><br><span> int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id)</span><br><span> {</span><br><span> struct gsm_lchan *lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span> </span><br><span> lchan = msg->lchan;</span><br><span> if (!lchan_may_receive_data(lchan)) {</span><br><span>@@ -1028,21 +1027,8 @@</span><br><span> * MSC */</span><br><span> dispatch_dtap(lchan->conn, link_id, msg);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* allocate a new connection */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->conn = bsc_subscr_con_allocate(msg->lchan->ts->trx->bts->network);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!lchan->conn) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL);</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%);">- lchan->conn->lchan = lchan;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* fwd via bsc_api to send COMPLETE L3 INFO to MSC */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = bsc_compl_l3(lchan->conn, msg, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_A_DISC_IND, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return bsc_compl_l3(lchan, msg, 0);</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index 7741939..5a25aad 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>@@ -25,6 +25,7 @@</span><br><span> #include <osmocom/bsc/paging.h></span><br><span> #include <osmocom/bsc/gsm_08_08.h></span><br><span> #include <osmocom/bsc/codec_pref.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/lchan_fsm.h></span><br><span> </span><br><span> #include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/a_reset.h></span><br><span>@@ -428,8 +429,9 @@</span><br><span> }</span><br><span> </span><br><span> /*! 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(120, 100%, 40%);">+int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_subscriber_connection *conn;</span><br><span> struct bsc_msc_data *msc;</span><br><span> struct msgb *create_l3;</span><br><span> struct gsm0808_speech_codec_list scl;</span><br><span>@@ -440,6 +442,7 @@</span><br><span> struct osmo_mobile_identity mi;</span><br><span> struct gsm48_hdr *gh;</span><br><span> uint8_t pdisc, mtype;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool release_lchan = true;</span><br><span> </span><br><span> if (msgb_l3len(msg) < sizeof(*gh)) {</span><br><span> LOGP(DRSL, LOGL_ERROR, "There is no GSM48 header here.\n");</span><br><span>@@ -461,6 +464,15 @@</span><br><span> */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* allocate a new connection */</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = bsc_subscr_con_allocate(bsc_gsmnet);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_COMPL_L3(pdisc, mtype, LOGL_ERROR, "Failed to allocate conn\n");</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%);">+ gscon_change_primary_lchan(conn, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ gscon_update_id(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);</span><br><span> </span><br><span> /* find the MSC link we want to use */</span><br><span>@@ -511,8 +523,12 @@</span><br><span> goto early_fail;</span><br><span> }</span><br><span> rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, create_l3);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ release_lchan = false;</span><br><span> </span><br><span> early_fail:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (release_lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL);</span><br><span> log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span> return rc;</span><br><span> }</span><br><span>diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c</span><br><span>index d999608..6a6ff8b 100644</span><br><span>--- a/tests/bsc/bsc_test.c</span><br><span>+++ b/tests/bsc/bsc_test.c</span><br><span>@@ -225,7 +225,7 @@</span><br><span> </span><br><span> void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause) {}</span><br><span> void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) {}</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(120, 100%, 40%);">+int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel)</span><br><span> { return 0; }</span><br><span> void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) {}</span><br><span> void bsc_assign_compl(struct gsm_subscriber_connection *conn, uint8_t rr_cause) {}</span><br><span>diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c</span><br><span>index 35531f8..8ee29f7 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.c</span><br><span>+++ b/tests/gsm0408/gsm0408_test.c</span><br><span>@@ -952,8 +952,8 @@</span><br><span> </span><br><span> bool lchan_may_receive_data(struct gsm_lchan *lchan) { return true; }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int bsc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t chosen_channel) { return 0; }</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return 0; }</span><br><span> </span><br><span> void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id,</span><br><span> struct msgb *msg) {}</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 78e8daf..ba0ec21 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -1796,7 +1796,7 @@</span><br><span> int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; }</span><br><span> void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause) {}</span><br><span> void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) {}</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(120, 100%, 40%);">+int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel)</span><br><span> { return 0; }</span><br><span> void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) {}</span><br><span> void bsc_assign_compl(struct gsm_subscriber_connection *conn, uint8_t rr_cause) {}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20343">change 20343</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/+/20343"/><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: I92af0f0d54c4282d782f2b29d524a64006c3b674 </div>
<div style="display:none"> Gerrit-Change-Number: 20343 </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>