From 87ef68eb33d463d8aad1511a272cbdb779f1ba19 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 10 Nov 2016 02:18:00 +0100 Subject: 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 --- openbsc/src/libbsc/abis_om2000.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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: -- cgit v1.2.3