22 Sep
2022
22 Sep
'22
6:22 p.m.
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29442 )
Change subject: llc: make logging category configurable
......................................................................
llc: make logging category configurable
Similar to Icfef6de126304da81120f1d7b212992ead3409aa, let's add
osmo_gprs_llc_set_log_cat() allowing the API users to change
logging category for libosmo-gprs-llc (DLGLOBAL is default).
Change-Id: I9deb794db1c80257ba81523f815232208381bc27
---
M include/osmocom/gprs/llc/llc.h
M src/llc/Makefile.am
M src/llc/llc_pdu.c
A src/llc/misc.c
4 files changed, 36 insertions(+), 9 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h
index 4723a4b..510b11c 100644
--- a/include/osmocom/gprs/llc/llc.h
+++ b/include/osmocom/gprs/llc/llc.h
@@ -145,3 +145,5 @@
int osmo_gprs_llc_pdu_encode(struct msgb *msg, const struct osmo_gprs_llc_pdu_decoded
*pdu);
uint32_t osmo_gprs_llc_fcs(const uint8_t *data, size_t len);
+
+void osmo_gprs_llc_set_log_cat(int cat);
diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am
index e24a3b3..a301a89 100644
--- a/src/llc/Makefile.am
+++ b/src/llc/Makefile.am
@@ -24,6 +24,7 @@
libosmo_gprs_llc_la_SOURCES = \
crc24.c \
llc_pdu.c \
+ misc.c \
$(NULL)
libosmo_gprs_llc_la_LDFLAGS = \
diff --git a/src/llc/llc_pdu.c b/src/llc/llc_pdu.c
index e55e311..5430377 100644
--- a/src/llc/llc_pdu.c
+++ b/src/llc/llc_pdu.c
@@ -29,13 +29,12 @@
#include <osmocom/gprs/llc/llc.h>
-/* TODO: make logging category configurable */
-#define DLLC DLGLOBAL
-
#define UI_HDR_LEN 3
#define N202 4
#define CRC24_LENGTH 3
+extern int g_log_cat;
+
const struct value_string osmo_gprs_llc_sapi_names[] = {
{ OSMO_GPRS_LLC_SAPI_GMM, "GMM" },
{ OSMO_GPRS_LLC_SAPI_TOM2, "TOM2" },
@@ -254,7 +253,7 @@
ctrl[0] |= GPRS_LLC_U_XID;
break;
default:
- LOGP(DLLC, LOGL_ERROR,
+ LOGP(g_log_cat, LOGL_ERROR,
"Unknown UI func=0x%02x\n", pdu->func);
return -EINVAL;
}
@@ -269,7 +268,7 @@
/* 5.5a Message Authentication Code (MAC) field */
if (pdu->flags & OSMO_GPRS_LLC_PDU_F_MAC_PRES) {
/* TODO: calculate MAC (see 3GPP TS 43.020) */
- LOGP(DLLC, LOGL_ERROR,
+ LOGP(g_log_cat, LOGL_ERROR,
"Message Authentication Code (MAC) is not implemented\n");
return -ENOTSUP;
}
@@ -296,7 +295,7 @@
#define check_len(len, text) \
do { \
if (data_len < (len)) { \
- LOGP(DLLC, LOGL_ERROR, "Failed to parse LLC PDU: %s\n", text); \
+ LOGP(g_log_cat, LOGL_ERROR, "Failed to parse LLC PDU: %s\n", text); \
return -EINVAL; \
} \
} while (0)
@@ -317,7 +316,7 @@
/* 6.2.1 Protocol Discriminator bit (PD): shall be 0 */
if (*addr & 0x80) {
- LOGP(DLLC, LOGL_ERROR, "Protocol Discriminator shall be 0\n");
+ LOGP(g_log_cat, LOGL_ERROR, "Protocol Discriminator shall be 0\n");
return -EINVAL;
}
@@ -337,7 +336,7 @@
case 0x0c:
case 0x0d:
case 0x0f:
- LOGP(DLLC, LOGL_ERROR, "Unknown SAPI=%u\n", pdu->sapi);
+ LOGP(g_log_cat, LOGL_ERROR, "Unknown SAPI=%u\n", pdu->sapi);
return -EINVAL;
}
@@ -486,7 +485,7 @@
pdu->data_len = data_len;
break;
default:
- LOGP(DLLC, LOGL_ERROR, "Unknown U func=0x%02x\n", ctrl[0] & 0x0f);
+ LOGP(g_log_cat, LOGL_ERROR, "Unknown U func=0x%02x\n", ctrl[0] & 0x0f);
return -ENOTSUP;
}
}
diff --git a/src/llc/misc.c b/src/llc/misc.c
new file mode 100644
index 0000000..06e2a6c
--- /dev/null
+++ b/src/llc/misc.c
@@ -0,0 +1,25 @@
+/*
+ * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de>
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <osmocom/core/logging.h>
+
+int g_log_cat = DLGLOBAL;
+
+void osmo_gprs_llc_set_log_cat(int cat)
+{
+ g_log_cat = cat;
+}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29442
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I9deb794db1c80257ba81523f815232208381bc27
Gerrit-Change-Number: 29442
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged