diff options
author | Harald Welte <laforge@gnumonks.org> | 2018-01-25 00:36:42 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-01-25 00:38:11 +0100 |
commit | 703f2ec6f40af2c2d46d10b5896b9dc74b65c3c0 (patch) | |
tree | b02ff002b2d7cbf07e07b0b6e0b5553be747100f | |
parent | 45f234c634444fe5410f75c18b55bb64cf5d4fe5 (diff) |
debug: Remove dead log categories
Change-Id: Ibdfc39ead4f0c5e3a74321e9d2c9720ae1603541
Related: OS#2528
-rw-r--r-- | include/osmocom/msc/debug.h | 17 | ||||
-rw-r--r-- | src/libcommon/debug.c | 73 | ||||
-rw-r--r-- | src/libcommon/gsup_client.c | 2 | ||||
-rw-r--r-- | src/libcommon/gsup_test_client.c | 2 | ||||
-rw-r--r-- | src/osmo-msc/msc_main.c | 4 |
5 files changed, 4 insertions, 94 deletions
diff --git a/include/osmocom/msc/debug.h b/include/osmocom/msc/debug.h index 65e197d52..f99dba57b 100644 --- a/include/osmocom/msc/debug.h +++ b/include/osmocom/msc/debug.h @@ -12,35 +12,18 @@ enum { DCC, DMM, DRR, - DRSL, - DNM, DMNCC, DPAG, - DMEAS, - DSCCP, DMSC, DMGCP, DHO, DDB, DREF, - DGPRS, - DNS, - DBSSGP, - DLLC, - DSNDCP, - DSLHC, - DNAT, DCTRL, DSMPP, - DFILTER, - DGTPHUB, DRANAP, - DSUA, - DV42BIS, - DPCU, DVLR, DIUCS, - DSIGTRAN, Debug_LastEntry, }; diff --git a/src/libcommon/debug.c b/src/libcommon/debug.c index 661eb6669..8c0e7875e 100644 --- a/src/libcommon/debug.c +++ b/src/libcommon/debug.c @@ -60,18 +60,6 @@ static const struct log_info_cat default_categories[] = { .color = "\033[1;34m", .enabled = 1, .loglevel = LOGL_NOTICE, }, - [DRSL] = { - .name = "DRSL", - .description = "A-bis Radio Siganlling Link (RSL)", - .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, - [DNM] = { - .name = "DNM", - .description = "A-bis Network Management / O&M (NM/OML)", - .color = "\033[1;36m", - .enabled = 1, .loglevel = LOGL_INFO, - }, [DMNCC] = { .name = "DMNCC", .description = "MNCC API for Call Control application", @@ -84,16 +72,6 @@ static const struct log_info_cat default_categories[] = { .color = "\033[1;38m", .enabled = 1, .loglevel = LOGL_NOTICE, }, - [DMEAS] = { - .name = "DMEAS", - .description = "Radio Measurement Processing", - .enabled = 0, .loglevel = LOGL_NOTICE, - }, - [DSCCP] = { - .name = "DSCCP", - .description = "SCCP Protocol", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, [DMSC] = { .name = "DMSC", .description = "Mobile Switching Center", @@ -119,36 +97,6 @@ static const struct log_info_cat default_categories[] = { .description = "Reference Counting", .enabled = 0, .loglevel = LOGL_NOTICE, }, - [DGPRS] = { - .name = "DGPRS", - .description = "GPRS Packet Service", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, - [DNS] = { - .name = "DNS", - .description = "GPRS Network Service (NS)", - .enabled = 1, .loglevel = LOGL_INFO, - }, - [DBSSGP] = { - .name = "DBSSGP", - .description = "GPRS BSS Gateway Protocol (BSSGP)", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, - [DLLC] = { - .name = "DLLC", - .description = "GPRS Logical Link Control Protocol (LLC)", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, - [DSNDCP] = { - .name = "DSNDCP", - .description = "GPRS Sub-Network Dependent Control Protocol (SNDCP)", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, - [DNAT] = { - .name = "DNAT", - .description = "GSM 08.08 NAT/Multiplexer", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, [DCTRL] = { .name = "DCTRL", .description = "Control interface", @@ -159,26 +107,11 @@ static const struct log_info_cat default_categories[] = { .description = "SMPP interface for external SMS apps", .enabled = 1, .loglevel = LOGL_DEBUG, }, - [DFILTER] = { - .name = "DFILTER", - .description = "BSC/NAT IMSI based filtering", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, [DRANAP] = { .name = "DRANAP", .description = "Radio Access Network Application Part Protocol", .enabled = 1, .loglevel = LOGL_DEBUG, }, - [DSUA] = { - .name = "DSUA", - .description = "SCCP User Adaptation Protocol", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, - [DPCU] = { - .name = "DPCU", - .description = "PCU Interface", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, [DVLR] = { .name = "DVLR", .description = "Visitor Location Register", @@ -189,12 +122,6 @@ static const struct log_info_cat default_categories[] = { .description = "Iu-CS Protocol", .enabled = 1, .loglevel = LOGL_DEBUG, }, - [DSIGTRAN] = { - .name = "DSIGTRAN", - .description = "SIGTRAN Signalling Transport", - .color = "\033[1;29m", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, }; static int filter_fn(const struct log_context *ctx, struct log_target *tar) diff --git a/src/libcommon/gsup_client.c b/src/libcommon/gsup_client.c index b5f2e6854..0335e210b 100644 --- a/src/libcommon/gsup_client.c +++ b/src/libcommon/gsup_client.c @@ -331,7 +331,7 @@ void gsup_client_destroy(struct gsup_client *gsupc) int gsup_client_send(struct gsup_client *gsupc, struct msgb *msg) { if (!gsupc || !gsupc->is_connected) { - LOGP(DGPRS, LOGL_ERROR, "GSUP not connected, unable to send %s\n", msgb_hexdump(msg)); + LOGP(DLGSUP, LOGL_ERROR, "GSUP not connected, unable to send %s\n", msgb_hexdump(msg)); msgb_free(msg); return -ENOTCONN; } diff --git a/src/libcommon/gsup_test_client.c b/src/libcommon/gsup_test_client.c index 557629268..860504067 100644 --- a/src/libcommon/gsup_test_client.c +++ b/src/libcommon/gsup_test_client.c @@ -201,7 +201,7 @@ static int gsupc_read_cb(struct gsup_client *gsupc, struct msgb *msg) struct imsi_op *io; int rc; - DEBUGP(DGPRS, "Rx GSUP %s\n", osmo_hexdump(msgb_l2(msg), msgb_l2len(msg))); + DEBUGP(DLGSUP, "Rx GSUP %s\n", osmo_hexdump(msgb_l2(msg), msgb_l2len(msg))); rc = osmo_gsup_decode(msgb_l2(msg), msgb_l2len(msg), &gsup_msg); if (rc < 0) diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index a4b833e3f..98f192010 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -118,7 +118,7 @@ static void print_help() { printf(" Some useful help...\n"); printf(" -h --help This text.\n"); - printf(" -d option --debug=DRLL:DCC:DMM:DRR:DRSL:DNM Enable debugging.\n"); + printf(" -d option --debug=DCC:DMM:DRR: Enable debugging.\n"); printf(" -D --daemonize Fork the process into a background daemon.\n"); printf(" -c --config-file filename The config file to use.\n"); printf(" -s --disable-color\n"); @@ -420,7 +420,7 @@ int main(int argc, char **argv) rc = vty_read_config_file(msc_cmdline_config.config_file, NULL); if (rc < 0) { - LOGP(DNM, LOGL_FATAL, "Failed to parse the config file: '%s'\n", + LOGP(DMSC, LOGL_FATAL, "Failed to parse the config file: '%s'\n", msc_cmdline_config.config_file); return 1; } |