Change in osmo-bsc[master]: assignment: signal assignment failure on chan act nack

[Harald Welte]

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

Change subject: assignment: signal assignment failure on chan act nack
......................................................................

assignment: signal assignment failure on chan act nack

When the BTS responds with a Chan Act NACK, i.e. the lchan could not be
activated, immediately signal Assignment Failure to the MSC (in
handle_chan_nack()).

In handle_chan_nack(), adjust log: instead of waiting for timeout, we now
signal Assignment Failure.

Drop misleading logging from bsc_assign_fail(): instead of transmitting the
Assignment Failure message, it actually signals an FSM event. Leave logging of
that to the FSM logging.

Change-Id: Ib204b4a5272f9b7b60ca5f932cd8a4c857316270
---
M src/osmo-bsc/bsc_api.c
M src/osmo-bsc/osmo_bsc_api.c
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/src/osmo-bsc/bsc_api.c b/src/osmo-bsc/bsc_api.c
index 02a59cc..7aa0e36 100644
--- a/src/osmo-bsc/bsc_api.c
+++ b/src/osmo-bsc/bsc_api.c
@@ -740,9 +740,10 @@
 	if (conn->secondary_lchan != lchan)
 		return;
 
-	LOGPLCHAN(lchan, DMSC, LOGL_ERROR, "Channel activation failed. Waiting for timeout now\n");
+	LOGPLCHAN(lchan, DMSC, LOGL_ERROR, "Channel activation failed.\n");
 	conn->secondary_lchan->conn = NULL;
 	conn->secondary_lchan = NULL;
+	bsc_assign_fail(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE, NULL);
 }
 
 static __attribute__((constructor)) void on_dso_load_bsc(void)
diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c
index 51fbdd3..f3c36c3 100644
--- a/src/osmo-bsc/osmo_bsc_api.c
+++ b/src/osmo-bsc/osmo_bsc_api.c
@@ -425,8 +425,9 @@
 /*! BSC->MSC: Assignment of lchan failed. */
 void bsc_assign_fail(struct gsm_subscriber_connection *conn, uint8_t cause, uint8_t *rr_cause)
 {
-	LOGP(DMSC, LOGL_INFO, "Tx MSC ASSIGN FAIL\n");
-	osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_RR_ASS_FAIL, NULL);
+	LOGPFSML(conn->fi, LOGL_ERROR, "Assignment failure: BSSMAP: '%s' from RR: '%s'\n",
+		 gsm0808_cause_name(cause), rr_cause ? rr_cause_name(*rr_cause) : "(none)");
+	osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_RR_ASS_FAIL, &cause);
 }
 
 /*! BSC->MSC: RR conn has been cleared. */

-- 
To view, visit https://gerrit.osmocom.org/9281
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: Ib204b4a5272f9b7b60ca5f932cd8a4c857316270
Gerrit-Change-Number: 9281
Gerrit-PatchSet: 8
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180608/c210baaf/attachment.htm>