osmocom
/
libosmo-gprs
mirror of https://gerrit.osmocom.org/libosmo-gprs
11
0
Fork 0
Code Releases Wiki Activity

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
This commit is contained in:
Vadim Yanitskiy 2022-09-22 01:50:43 +07:00
parent 22189e7329
commit 0b5a816356
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmocom/gprs/llc/llc.h
View File

@ -145,3 +145,5 @@ int osmo_gprs_llc_pdu_decode(struct osmo_gprs_llc_pdu_decoded *pdu,
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);

1
src/llc/Makefile.am
View File

@ -24,6 +24,7 @@ lib_LTLIBRARIES = \
libosmo_gprs_llc_la_SOURCES = \
crc24.c \
llc_pdu.c \
misc.c \
$(NULL)
libosmo_gprs_llc_la_LDFLAGS = \

17
src/llc/llc_pdu.c
View File

@ -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 @@ int osmo_gprs_llc_pdu_encode(struct msgb *msg, const struct osmo_gprs_llc_pdu_de
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 @@ int osmo_gprs_llc_pdu_encode(struct msgb *msg, const struct osmo_gprs_llc_pdu_de
/* 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 @@ int osmo_gprs_llc_pdu_decode(struct osmo_gprs_llc_pdu_decoded *pdu,
#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 @@ int osmo_gprs_llc_pdu_decode(struct osmo_gprs_llc_pdu_decoded *pdu,
/* 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 @@ int osmo_gprs_llc_pdu_decode(struct osmo_gprs_llc_pdu_decoded *pdu,
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 @@ int osmo_gprs_llc_pdu_decode(struct osmo_gprs_llc_pdu_decoded *pdu,
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;
}
}

25
src/llc/misc.c Normal file
View File

@ -0,0 +1,25 @@
/*
* (C) 2022 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
* Author: Vadim Yanitskiy <vyanitskiy@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;
}