Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11700 )
Change subject: always directly send BSSMAP Clear Request ...................................................................... always directly send BSSMAP Clear Request When a gscon wants to send a BSSMAP Clear Request, it makes no sense to do it conditionally depending on the current conn state. Just send it: don't call gscon_sigtran_send(), directly go for osmo_bsc_sigtran_send(). In particular, if an incoming inter-BSC handover ends in failure, the gscon state is still ST_INIT, but if the MSC fails to give us a Clear Command, we may want to ask with a BSSMAP Clear Request. Change-Id: I39fae24260a4bb7a6af704ebe760f93fff566536 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index d2ca03e..074c238 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -134,7 +134,14 @@ enum gsm0808_cause cause) { struct msgb *resp = gsm0808_create_clear_rqst(cause); - gscon_sigtran_send(conn, resp); + int rc; + if (!resp) { + LOGPFSML(conn->fi, LOGL_ERROR, "Unable to compose BSSMAP Clear Request message\n"); + return; + } + rc = osmo_bsc_sigtran_send(conn, resp); + if (rc < 0) + LOGPFSML(conn->fi, LOGL_ERROR, "Unable to deliver BSSMAP Clear Request message\n"); } /* forward MO DTAP from RSL side to BSSAP side */ -- To view, visit https://gerrit.osmocom.org/11700 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: I39fae24260a4bb7a6af704ebe760f93fff566536 Gerrit-Change-Number: 11700 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith <osm...@sysmocom.de>