diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2020-09-11 23:35:28 +0000 |
---|---|---|
committer | laforge <laforge@osmocom.org> | 2020-10-07 10:19:58 +0000 |
commit | 2001dd6cb529a0992e1411b78b39073609350ec6 (patch) | |
tree | 5b86b460fe74579d4910e957589b97d054862275 /src | |
parent | e828988144f33e44d8e6d06d8a3ea0b305914268 (diff) |
compl l3: allocate conn in gsm_08_08.c, not gsm_04_08_rr.c
Move conn allocation to bsc_compl_l3(), from gsm0408_rcvmsg().
Drop dispatch of GSCON_EV_A_DISC_IND, because a) we did not receive such
DISC.IND, and b) the lchan release will discard the conn in the regular
fashion.
In upcoming LCS patch, bsc_compl_l3() will decide whether to allocate a new
conn or whether a conn from a Perform Location Request already exists for the
subscriber.
In this patch, it becomes clear that the conn->bsub is always NULL in
bsc_compl_l3(), and that the 'log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);'
never has the intended effect. An upcoming patch will change that.
Change-Id: I92af0f0d54c4282d782f2b29d524a64006c3b674
Diffstat (limited to 'src')
-rw-r--r-- | src/osmo-bsc/gsm_04_08_rr.c | 16 | ||||
-rw-r--r-- | src/osmo-bsc/gsm_08_08.c | 18 |
2 files changed, 18 insertions, 16 deletions
diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index a7bba0d4e..49ec84860 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -1015,7 +1015,6 @@ static void dispatch_dtap(struct gsm_subscriber_connection *conn, int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id) { struct gsm_lchan *lchan; - int rc; lchan = msg->lchan; if (!lchan_may_receive_data(lchan)) { @@ -1028,21 +1027,8 @@ int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id) * MSC */ dispatch_dtap(lchan->conn, link_id, msg); } else { - /* allocate a new connection */ - lchan->conn = bsc_subscr_con_allocate(msg->lchan->ts->trx->bts->network); - if (!lchan->conn) { - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); - return -1; - } - lchan->conn->lchan = lchan; - /* fwd via bsc_api to send COMPLETE L3 INFO to MSC */ - rc = bsc_compl_l3(lchan->conn, msg, 0); - if (rc < 0) { - osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_A_DISC_IND, NULL); - return rc; - } - /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */ + return bsc_compl_l3(lchan, msg, 0); } return 0; diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 9d22e3f41..f290a48e4 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -25,6 +25,7 @@ #include <osmocom/bsc/paging.h> #include <osmocom/bsc/gsm_08_08.h> #include <osmocom/bsc/codec_pref.h> +#include <osmocom/bsc/lchan_fsm.h> #include <osmocom/bsc/gsm_04_08_rr.h> #include <osmocom/bsc/a_reset.h> @@ -428,8 +429,9 @@ static void parse_powercap(struct gsm_subscriber_connection *conn, struct msgb * } /*! MS->MSC: New MM context with L3 payload. */ -int bsc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, uint16_t chosen_channel) +int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) { + struct gsm_subscriber_connection *conn; struct bsc_msc_data *msc; struct msgb *create_l3; struct gsm0808_speech_codec_list scl; @@ -440,6 +442,7 @@ int bsc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, uint1 struct osmo_mobile_identity mi; struct gsm48_hdr *gh; uint8_t pdisc, mtype; + bool release_lchan = true; if (msgb_l3len(msg) < sizeof(*gh)) { LOGP(DRSL, LOGL_ERROR, "There is no GSM48 header here.\n"); @@ -461,6 +464,15 @@ int bsc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, uint1 */ } + /* allocate a new connection */ + conn = bsc_subscr_con_allocate(bsc_gsmnet); + if (!conn) { + LOG_COMPL_L3(pdisc, mtype, LOGL_ERROR, "Failed to allocate conn\n"); + goto early_fail; + } + gscon_change_primary_lchan(conn, lchan); + gscon_update_id(conn); + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); /* find the MSC link we want to use */ @@ -511,8 +523,12 @@ int bsc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, uint1 goto early_fail; } rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, create_l3); + if (!rc) + release_lchan = false; early_fail: + if (release_lchan) + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); log_set_context(LOG_CTX_BSC_SUBSCR, NULL); return rc; } |