Harald Welte has submitted this change and it was merged.
Change subject: logging: Remove obsolete log categories
......................................................................
logging: Remove obsolete log categories
About half of our log categories/subsystems were inherited from
OsmoNITB, and are no longer used but may confuse the user.
Change-Id: I8b39429f71c0faefdf8158a82093cfb19f44809e
---
M include/osmocom/bsc/debug.h
M src/osmo-bsc/osmo_bsc_main.c
M tests/bsc-nat/bsc_nat_test.c
3 files changed, 1 insertion(+), 90 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/bsc/debug.h b/include/osmocom/bsc/debug.h
index b9295a0..37f102c 100644
--- a/include/osmocom/bsc/debug.h
+++ b/include/osmocom/bsc/debug.h
@@ -14,33 +14,16 @@
DRR,
DRSL,
DNM,
- DMNCC,
DPAG,
DMEAS,
- DSCCP,
DMSC,
DMGCP,
DHO,
DHODEC,
- 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/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 424d816..fd52734 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -315,12 +315,6 @@
.color = "\033[1;36m",
.enabled = 1, .loglevel = LOGL_INFO,
},
- [DMNCC] = {
- .name = "DMNCC",
- .description = "MNCC API for Call Control application",
- .color = "\033[1;39m",
- .enabled = 1, .loglevel = LOGL_NOTICE,
- },
[DPAG] = {
.name = "DPAG",
.description = "Paging Subsystem",
@@ -331,11 +325,6 @@
.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",
@@ -359,40 +348,10 @@
.color = "\033[1;38m",
.enabled = 1, .loglevel = LOGL_NOTICE,
},
- [DDB] = {
- .name = "DDB",
- .description = "Database Layer",
- .enabled = 1, .loglevel = LOGL_NOTICE,
- },
[DREF] = {
.name = "DREF",
.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",
@@ -404,45 +363,14 @@
.description = "Control interface",
.enabled = 1, .loglevel = LOGL_NOTICE,
},
- [DSMPP] = {
- .name = "DSMPP",
- .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",
- .enabled = 1, .loglevel = LOGL_DEBUG,
- },
- [DIUCS] = {
- .name = "DIUCS",
- .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,
},
};
diff --git a/tests/bsc-nat/bsc_nat_test.c b/tests/bsc-nat/bsc_nat_test.c
index 3d3b455..09378ae 100644
--- a/tests/bsc-nat/bsc_nat_test.c
+++ b/tests/bsc-nat/bsc_nat_test.c
@@ -1560,7 +1560,7 @@
int main(int argc, char **argv)
{
msgb_talloc_ctx_init(NULL, 0);
- sccp_set_log_area(DSCCP);
+ sccp_set_log_area(DLSCCP);
osmo_init_logging(&log_info);
test_filter();
--
To view, visit https://gerrit.osmocom.org/6543
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b39429f71c0faefdf8158a82093cfb19f44809e
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: dexter <pma...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
