summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2017-03-16 13:57:47 +0100
committerMax <msuraev@sysmocom.de>2017-03-16 14:07:06 +0100
commit88d4fc70d57ffb091f60f4af01457d3943b63903 (patch)
tree913fc0c1a4f771de29e5fa4302ffffd0fe5dc186
parent6dd0fc685b7149f67a5fe17a5bce55c446aa563c (diff)
Don't drop OML links for Get Attributes NACK
Previously any OML NACK message will result in BSC dropping OML link to BTS which makes it impossible to use optional OML messages which might be unsupported by BTS. Fix this for 3GPP TS 52.021 ยง8.11.1 Get Attributes message. Also, log human-readable NACK name to see what exactly causing OML link drop. Change-Id: Ib8af2872c27abb793172ec59bdc145b8d54f83da Related: OS#1614
-rw-r--r--openbsc/src/libbsc/bsc_init.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c
index b17ff79c5..521fc891f 100644
--- a/openbsc/src/libbsc/bsc_init.c
+++ b/openbsc/src/libbsc/bsc_init.c
@@ -44,19 +44,19 @@ extern struct gsm_network *bsc_gsmnet;
/* Callback function for NACK on the OML NM */
static int oml_msg_nack(struct nm_nack_signal_data *nack)
{
- if (nack->mt == NM_MT_SET_BTS_ATTR_NACK) {
-
- LOGP(DNM, LOGL_ERROR, "Failed to set BTS attributes. That is fatal. "
- "Was the bts type and frequency properly specified?\n");
- goto drop_bts;
- } else {
- LOGP(DNM, LOGL_ERROR, "Got a NACK going to drop the OML links.\n");
- goto drop_bts;
+ if (nack->mt == NM_MT_GET_ATTR_NACK) {
+ LOGP(DNM, LOGL_ERROR, "BTS%u does not support Get Attributes "
+ "OML message.\n", nack->bts->nr);
+ return 0;
}
- return 0;
+ if (nack->mt == NM_MT_SET_BTS_ATTR_NACK)
+ LOGP(DNM, LOGL_ERROR, "Failed to set BTS attributes. That is fatal. "
+ "Was the bts type and frequency properly specified?\n");
+ else
+ LOGP(DNM, LOGL_ERROR, "Got %s NACK going to drop the OML links.\n",
+ abis_nm_nack_name(nack->mt));
-drop_bts:
if (!nack->bts) {
LOGP(DNM, LOGL_ERROR, "Unknown bts. Can not drop it.\n");
return 0;