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

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 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.

Cosmetic: in this file, the struct bsc_api* is typically named 'bsc', not
'api', so rename the arg.

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/libbsc/bsc_api.c
M src/osmo-bsc/osmo_bsc_api.c
2 files changed, 3 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/9281/1

diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c
index 8ae781e..043a5a7 100644
--- a/src/libbsc/bsc_api.c
+++ b/src/libbsc/bsc_api.c
@@ -825,14 +825,15 @@
 }
 
 static void handle_chan_nack(struct gsm_subscriber_connection *conn,
-			     struct bsc_api *api, struct gsm_lchan *lchan)
+			     struct bsc_api *bsc, struct gsm_lchan *lchan)
 {
 	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 8c16bde..e026b69 100644
--- a/src/osmo-bsc/osmo_bsc_api.c
+++ b/src/osmo-bsc/osmo_bsc_api.c
@@ -426,7 +426,6 @@
 static 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);
 }
 

-- 
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: newchange
Gerrit-Change-Id: Ib204b4a5272f9b7b60ca5f932cd8a4c857316270
Gerrit-Change-Number: 9281
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180524/2c8ff3e5/attachment.htm>