summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp <pmaier@sysmocom.de>2016-10-10 15:11:41 +0200
committerHarald Welte <laforge@gnumonks.org>2016-11-01 21:56:22 +0000
commitd37981e8f7151c6a5733f52f3209372fe96d2e59 (patch)
treec89dc3cf992e5206a856b93b3b22949f1d8f6122
parentb4cb83809226218db18d650aa9c8700370501d37 (diff)
gsm0408: Adding log output for 3g specific RR messages
GSM 04.18, which is the successor of GSM 04.08, describes additional RR 3g specific message types. This commit adds log output for those messages. The behaviour is not changed all affected message types are still forwared to the MSC as they were before. See also 3GPP TS 04.18, section 10.4, table 10.4.1 The change requires to update libosmocore as well, see also commit f48fdb3a108da0dc23d7af4ac021e98e11f07152 in libosmocore.git for details. Change-Id: I41f2242fdf59c3eb4b3f8f7f003c17f7e0df01aa
-rw-r--r--openbsc/src/libbsc/bsc_api.c14
-rw-r--r--openbsc/src/libmsc/gsm_04_08.c4
2 files changed, 11 insertions, 7 deletions
diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c
index cc12e9f7e..207e12ad5 100644
--- a/openbsc/src/libbsc/bsc_api.c
+++ b/openbsc/src/libbsc/bsc_api.c
@@ -34,6 +34,7 @@
#include <openbsc/trau_mux.h>
#include <osmocom/gsm/protocol/gsm_08_08.h>
+#include <osmocom/gsm/gsm48.h>
#include <osmocom/core/talloc.h>
@@ -587,11 +588,13 @@ static void dispatch_dtap(struct gsm_subscriber_connection *conn,
case GSM48_PDISC_RR:
switch (msg_type) {
case GSM48_MT_RR_GPRS_SUSP_REQ:
- DEBUGP(DRR, "GRPS SUSPEND REQUEST\n");
+ DEBUGP(DRR, "%s\n",
+ gsm48_rr_msg_name(GSM48_MT_RR_GPRS_SUSP_REQ));
break;
case GSM48_MT_RR_STATUS:
- LOGP(DRR, LOGL_NOTICE, "RR STATUS (cause: %s)\n",
- rr_cause_name(gh->data[0]));
+ LOGP(DRR, LOGL_NOTICE, "%s (cause: %s)\n",
+ gsm48_rr_msg_name(GSM48_MT_RR_GPRS_SUSP_REQ),
+ rr_cause_name(gh->data[0]));
break;
case GSM48_MT_RR_MEAS_REP:
/* This shouldn't actually end up here, as RSL treats
@@ -643,8 +646,9 @@ static void dispatch_dtap(struct gsm_subscriber_connection *conn,
/* Normally, a MSC should never receive RR
* messages, but we'd rather forward what we
* don't know than drop it... */
- LOGP(DRR, LOGL_NOTICE, "BSC: Passing unknown 04.08 "
- "RR message type 0x%02x to MSC\n", msg_type);
+ LOGP(DRR, LOGL_NOTICE,
+ "BSC: Passing %s 04.08 RR message to MSC\n",
+ gsm48_rr_msg_name(msg_type));
if (api->dtap)
api->dtap(conn, link_id, msg);
}
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index a22e3c242..3e362fa1c 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -1270,8 +1270,8 @@ static int gsm0408_rcv_rr(struct gsm_subscriber_connection *conn, struct msgb *m
rc = gsm48_rx_rr_app_info(conn, msg);
break;
default:
- LOGP(DRR, LOGL_NOTICE, "MSC: Unimplemented "
- "GSM 04.08 RR msg type 0x%02x\n", gh->msg_type);
+ LOGP(DRR, LOGL_NOTICE, "MSC: Unimplemented %s GSM 04.08 RR "
+ "message\n", gsm48_rr_msg_name(gh->msg_type));
break;
}