Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11606 )

Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete
......................................................................

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
---
M src/osmo-bsc/gsm_04_08_rr.c
M tests/gsm0408/gsm0408_test.c
2 files changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c
index 4659c1a..4be5198 100644
--- a/src/osmo-bsc/gsm_04_08_rr.c
+++ b/src/osmo-bsc/gsm_04_08_rr.c
@@ -927,6 +927,7 @@
 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 @@
 		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 d15e149..a30aaf8 100644
--- a/tests/gsm0408/gsm0408_test.c
+++ b/tests/gsm0408/gsm0408_test.c
@@ -952,6 +952,10 @@
 	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;

-- 
To view, visit https://gerrit.osmocom.org/11606
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210
Gerrit-Change-Number: 11606
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181121/e3d11fb7/attachment.htm>