diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-12-10 17:01:06 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-12-11 03:42:58 +0100 |
| commit | 9795cf1b126d5567dbd0a25b56e9ba75be9513c1 (patch) | |
| tree | f5ebaeee310e02c6b21cf40839c083438cf93655 | |
| parent | fd9ec3bc7dee3037754005c9e44dfce7246a6659 (diff) | |
fix: DLGSUP logging category "unusable"
All DL* categories are typically negative, but DLGSUP isn't, and it's also not
in libosmocore's internal_cat array.
See: 3b6fb0880c3ab1e23a3d7d738d073b00c2a794c2
This means that a program using DLGSUP has to include DLGSUP in its own logging
cat array (typically not needed for DL* categories), which means for osmo-nitb
that DLGSUP (11) replaces DMGCP (also 11), and DMGCP becomes unusable.
Fix this: make DLGSUP -11 and include in internal_cat.
In gsup_test.c, no longer add DLGSUP to the logging categories array.
External follow-ups are otherwise needed only in osmo-hlr.git and some pending
patches for openbsc (Id3938267fa062e1a997d3704cd678874306f86ee).
Change-Id: Id974c7be158e4d60421a98110f5c807aefd31119
| -rw-r--r-- | include/osmocom/core/logging.h | 2 | ||||
| -rw-r--r-- | src/logging.c | 5 | ||||
| -rw-r--r-- | tests/gsup/gsup_test.c | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index ad775b9b..cc3919b6 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -92,7 +92,7 @@ void logp(int subsys, const char *file, int line, int cont, const char *format, #define DLCTRL -8 /*!< Control Interface */ #define DLGTP -9 /*!< GTP (GPRS Tunneling Protocol */ #define DLSTATS -10 /*!< Statistics */ -#define DLGSUP 11 /*!< Generic Subscriber Update Protocol */ +#define DLGSUP -11 /*!< Generic Subscriber Update Protocol */ #define OSMO_NUM_DLIB 11 /*!< Number of logging sub-systems in libraries */ /*! Configuration of singgle log category / sub-system */ diff --git a/src/logging.c b/src/logging.c index 1516a7d8..30d0b8da 100644 --- a/src/logging.c +++ b/src/logging.c @@ -123,6 +123,11 @@ static const struct log_info_cat internal_cat[OSMO_NUM_DLIB] = { .description = "Statistics messages and logging", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [INT2IDX(DLGSUP)] = { + .name = "DLGSUP", + .description = "Generic Subscriber Update Protocol", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, }; /*! \brief descriptive string for each log level */ diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 2b0a2938..7af16b76 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -241,11 +241,6 @@ static void test_gsup_messages_dec_enc(void) } const struct log_info_cat default_categories[] = { - [DLGSUP] = { - .name = "DLGSUP", - .description = "Generic Subscriber Update Protocol", - .enabled = 0, .loglevel = LOGL_DEBUG, - }, }; static struct log_info info = { |