diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-05-30 22:08:21 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-06-09 17:44:12 +0200 |
| commit | 7325d9379df19610691ea45ee2cae9d635566b32 (patch) | |
| tree | 10b8c8d16067f882add8a3d1800ce1c79a08b0ab | |
| parent | cd326b3c20af9bd56f973ccab52030b74b6dc520 (diff) | |
Remove unused logging subsystems DCC and DMGCP
We use the newly-introduced logging_vty_add_deprecated_subsys() from
libosmovty to make sure old config files will still parse even after
this change.
Change-Id: Ib4f67bb00e1d5460e643717b53f6a4d81278dc5d
| -rw-r--r-- | include/osmocom/bsc/debug.h | 2 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_main.c | 16 |
2 files changed, 4 insertions, 14 deletions
diff --git a/include/osmocom/bsc/debug.h b/include/osmocom/bsc/debug.h index 006b91873..1133bf6f6 100644 --- a/include/osmocom/bsc/debug.h +++ b/include/osmocom/bsc/debug.h @@ -9,7 +9,6 @@ /* Debug Areas of the code */ enum { DRLL, - DCC, DMM, DRR, DRSL, @@ -17,7 +16,6 @@ enum { DPAG, DMEAS, DMSC, - DMGCP, DHO, DHODEC, DREF, diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 494f28043..8495608f5 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -44,6 +44,7 @@ #include <osmocom/gsm/protocol/gsm_12_21.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/ports.h> +#include <osmocom/vty/logging.h> #include <osmocom/abis/abis.h> #include <osmocom/bsc/abis_om2000.h> @@ -87,7 +88,7 @@ static void print_help() printf(" Some useful help...\n"); printf(" -h --help this text\n"); printf(" -D --daemonize Fork the process into a background daemon\n"); - printf(" -d option --debug=DRLL:DCC:DMM:DRR:DRSL:DNM enable debugging\n"); + printf(" -d option --debug=DRLL:DMM:DRR:DRSL:DNM enable debugging\n"); printf(" -s --disable-color\n"); printf(" -T --timestamp. Print a timestamp in the debug output.\n"); printf(" -c --config-file filename The config file to use.\n"); @@ -650,12 +651,6 @@ static const struct log_info_cat osmo_bsc_categories[] = { .color = "\033[1;31m", .enabled = 1, .loglevel = LOGL_NOTICE, }, - [DCC] = { - .name = "DCC", - .description = "Layer3 Call Control (CC)", - .color = "\033[1;32m", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, [DMM] = { .name = "DMM", .description = "Layer3 Mobility Management (MM)", @@ -696,11 +691,6 @@ static const struct log_info_cat osmo_bsc_categories[] = { .description = "Mobile Switching Center", .enabled = 1, .loglevel = LOGL_NOTICE, }, - [DMGCP] = { - .name = "DMGCP", - .description = "Media Gateway Control Protocol", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, [DHO] = { .name = "DHO", .description = "Hand-Over Process", @@ -808,6 +798,8 @@ int main(int argc, char **argv) bsc_vty_init(bsc_gsmnet); bsc_msg_lst_vty_init(tall_bsc_ctx, &access_lists, BSC_NODE); ctrl_vty_init(tall_bsc_ctx); + logging_vty_add_deprecated_subsys(tall_bsc_ctx, "cc"); + logging_vty_add_deprecated_subsys(tall_bsc_ctx, "mgcp"); /* Initalize SS7 */ osmo_ss7_init(); |