From 77cd1129931928d2a6e7667d0374feeeed71b0ce Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 5 Nov 2018 13:58:32 +0100 Subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete gscon_release_lchans stub is added to gsm0408_test.c to make linker happy. Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 --- src/osmo-bsc/gsm_04_08_rr.c | 7 ++++++- tests/gsm0408/gsm0408_test.c | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 4659c1ac9..4be51981f 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -927,6 +927,7 @@ 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)) { @@ -948,7 +949,11 @@ int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id) lchan->conn->lchan = lchan; /* fwd via bsc_api to send COMPLETE L3 INFO to MSC */ - bsc_compl_l3(lchan->conn, msg, 0); + rc = bsc_compl_l3(lchan->conn, msg, 0); + if (rc < 0) { + gscon_release_lchans(lchan->conn, true); + return rc; + } /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */ } diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index d15e149a2..a30aaf841 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -952,6 +952,10 @@ struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *ne OSMO_ASSERT(0); } +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release) { + OSMO_ASSERT(0); +} + bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; -- cgit v1.2.3