abis_nm: Provide a reason when an invalid channel configuration is used
Provide a human readable reason the channel combination is not allowed.
diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c
index a6a20e0..e9dc1d6 100644
--- a/openbsc/src/libbsc/abis_nm.c
+++ b/openbsc/src/libbsc/abis_nm.c
@@ -1423,10 +1423,13 @@
return abis_nm_sendmsg(trx->bts, msg);
}
-static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb)
+static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb,
+ const char **reason)
{
int i;
+ *reason = "Reason unknown";
+
/* As it turns out, the BS-11 has some very peculiar restrictions
* on the channel combinations it allows */
switch (ts->trx->bts->type) {
@@ -1435,6 +1438,7 @@
case NM_CHANC_TCHHalf:
case NM_CHANC_TCHHalf2:
/* not supported */
+ *reason = "TCH/H is not supported.";
return -EINVAL;
case NM_CHANC_SDCCH:
/* only one SDCCH/8 per TRX */
@@ -1442,34 +1446,45 @@
if (i == ts->nr)
continue;
if (ts->trx->ts[i].nm_chan_comb ==
- NM_CHANC_SDCCH)
+ NM_CHANC_SDCCH) {
+ *reason = "Only one SDCCH/8 per TRX allowed.";
return -EINVAL;
+ }
}
/* not allowed for TS0 of BCCH-TRX */
if (ts->trx == ts->trx->bts->c0 &&
- ts->nr == 0)
- return -EINVAL;
+ ts->nr == 0) {
+ *reason = "SDCCH/8 must be on TS0.";
+ return -EINVAL;
+ }
+
/* not on the same TRX that has a BCCH+SDCCH4
* combination */
if (ts->trx == ts->trx->bts->c0 &&
(ts->trx->ts[0].nm_chan_comb == 5 ||
- ts->trx->ts[0].nm_chan_comb == 8))
- return -EINVAL;
+ ts->trx->ts[0].nm_chan_comb == 8)) {
+ *reason = "SDCCH/8 and BCCH must be on the same TRX.";
+ return -EINVAL;
+ }
break;
case NM_CHANC_mainBCCH:
case NM_CHANC_BCCHComb:
/* allowed only for TS0 of C0 */
- if (ts->trx != ts->trx->bts->c0 ||
- ts->nr != 0)
+ if (ts->trx != ts->trx->bts->c0 || ts->nr != 0) {
+ *reason = "Main BCCH must be on TS0.";
return -EINVAL;
+ }
break;
case NM_CHANC_BCCH:
/* allowed only for TS 2/4/6 of C0 */
- if (ts->trx != ts->trx->bts->c0)
+ if (ts->trx != ts->trx->bts->c0) {
+ *reason = "BCCH must be on C0.";
return -EINVAL;
- if (ts->nr != 2 && ts->nr != 4 &&
- ts->nr != 6)
+ }
+ if (ts->nr != 2 && ts->nr != 4 && ts->nr != 6) {
+ *reason = "BCCH must be on TS 2/4/6.";
return -EINVAL;
+ }
break;
case 8: /* this is not like 08.58, but in fact
* FCCH+SCH+BCCH+CCCH+SDCCH/4+SACCH/C4+CBCH */
@@ -1489,6 +1504,7 @@
return 0;
break;
default:
+ *reason = "TS0 of TRX0 must carry a BCCH.";
return -EINVAL;
}
} else {
@@ -1498,6 +1514,7 @@
case NM_CHANC_IPAC_TCHFull_TCHHalf:
return 0;
default:
+ *reason = "TS0 must carry a TCH/F or TCH/H.";
return -EINVAL;
}
}
@@ -1509,6 +1526,7 @@
if (ts->trx->ts[0].nm_chan_comb ==
NM_CHANC_mainBCCH)
return 0;
+ *reason = "TS0 must be the main BCCH for CBCH.";
return -EINVAL;
case NM_CHANC_SDCCH:
case NM_CHANC_TCHFull:
@@ -1516,6 +1534,9 @@
case NM_CHANC_IPAC_TCHFull_TCHHalf:
case NM_CHANC_IPAC_TCHFull_PDCH:
return 0;
+ default:
+ *reason = "TS1 must carry a CBCH, SDCCH or TCH.";
+ return -EINVAL;
}
} else {
switch (chan_comb) {
@@ -1525,6 +1546,7 @@
case NM_CHANC_IPAC_TCHFull_TCHHalf:
return 0;
default:
+ *reason = "TS1 must carry a SDCCH or TCH.";
return -EINVAL;
}
}
@@ -1544,11 +1566,14 @@
case NM_CHANC_IPAC_TCHFull_PDCH:
if (ts->trx->nr == 0)
return 0;
- else
+ else {
+ *reason = "PDCH must be on TRX0.";
return -EINVAL;
+ }
}
break;
}
+ *reason = "Unknown combination";
return -EINVAL;
case GSM_BTS_TYPE_OSMO_SYSMO:
/* no known restrictions */
@@ -1568,14 +1593,17 @@
uint8_t zero = 0x00;
struct msgb *msg = nm_msgb_alloc();
uint8_t len = 2 + 2;
+ const char *reason = NULL;
if (bts->type == GSM_BTS_TYPE_BS11)
len += 4 + 2 + 2 + 3;
DEBUGP(DNM, "Set Chan Attr %s\n", gsm_ts_name(ts));
- if (verify_chan_comb(ts, chan_comb) < 0) {
+ if (verify_chan_comb(ts, chan_comb, &reason) < 0) {
msgb_free(msg);
- LOGP(DNM, LOGL_ERROR, "Invalid Channel Combination!!!\n");
+ LOGP(DNM, LOGL_ERROR,
+ "Invalid Channel Combination %d on %s. Reason: %s\n",
+ chan_comb, gsm_ts_name(ts), reason);
return -EINVAL;
}
ts->nm_chan_comb = chan_comb;