aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-11-10 02:18:00 +0100
committerHarald Welte <laforge@gnumonks.org>2016-11-10 17:05:02 +0000
commit87ef68eb33d463d8aad1511a272cbdb779f1ba19 (patch)
treecda1d1748e363c0beb16849d8f8f5aeac9b5f202
parentf926f45c4bb8d261cdbefec6aba65a167c6bbc92 (diff)
OM2000: disallow ip.access style TCH/F_PDCH pchan type
For TCH/F_PDCH, return an invalid chan comb (0) and print an error message that hints at the proper pchan type to use instead: TCH/F_TCH/H_PDCH Change-Id: Ibe0f944573f0a6d1be4bf7cf4986c4b2b3bd6d0d
-rw-r--r--openbsc/src/libbsc/abis_om2000.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c
index 0890a15d3..8c4bfb3b5 100644
--- a/openbsc/src/libbsc/abis_om2000.c
+++ b/openbsc/src/libbsc/abis_om2000.c
@@ -1264,6 +1264,15 @@ static uint8_t ts2comb(struct gsm_bts_trx_ts *ts)
{
switch (ts->pchan) {
case GSM_PCHAN_TCH_F_PDCH:
+ LOGP(DNM, LOGL_ERROR, "%s pchan %s not intended for use"
+ " with OM2000, use %s instead\n",
+ gsm_ts_and_pchan_name(ts),
+ gsm_pchan_name(GSM_PCHAN_TCH_F_PDCH),
+ gsm_pchan_name(GSM_PCHAN_TCH_F_TCH_H_PDCH));
+ /* If we allowed initialization of TCH/F_PDCH, it would fail
+ * when we try to send the ip.access specific RSL PDCH Act
+ * message for it. Rather fail completely right now: */
+ return 0;
case GSM_PCHAN_TCH_F_TCH_H_PDCH:
return pchan2comb(GSM_PCHAN_TCH_F);
default: