[MERGED] openbsc[master]: OM2000: disallow ip.access style TCH/F_PDCH pchan type

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: OM2000: disallow ip.access style TCH/F_PDCH pchan type
......................................................................


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
---
M openbsc/src/libbsc/abis_om2000.c
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c
index 0890a15..8c4bfb3 100644
--- a/openbsc/src/libbsc/abis_om2000.c
+++ b/openbsc/src/libbsc/abis_om2000.c
@@ -1264,6 +1264,15 @@
 {
 	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:

-- 
To view, visit https://gerrit.osmocom.org/1221
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe0f944573f0a6d1be4bf7cf4986c4b2b3bd6d0d
Gerrit-PatchSet: 2
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder