<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9414">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Remove unused logging subsystems DCC and DMGCP<br><br>We use the newly-introduced logging_vty_add_deprecated_subsys() from<br>libosmovty to make sure old config files will still parse even after<br>this change.<br><br>Change-Id: Ib4f67bb00e1d5460e643717b53f6a4d81278dc5d<br>---<br>M include/osmocom/bsc/debug.h<br>M src/osmo-bsc/osmo_bsc_main.c<br>2 files changed, 4 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/debug.h b/include/osmocom/bsc/debug.h</span><br><span>index 006b918..1133bf6 100644</span><br><span>--- a/include/osmocom/bsc/debug.h</span><br><span>+++ b/include/osmocom/bsc/debug.h</span><br><span>@@ -9,7 +9,6 @@</span><br><span> /* Debug Areas of the code */</span><br><span> enum {</span><br><span> DRLL,</span><br><span style="color: hsl(0, 100%, 40%);">- DCC,</span><br><span> DMM,</span><br><span> DRR,</span><br><span> DRSL,</span><br><span>@@ -17,7 +16,6 @@</span><br><span> DPAG,</span><br><span> DMEAS,</span><br><span> DMSC,</span><br><span style="color: hsl(0, 100%, 40%);">- DMGCP,</span><br><span> DHO,</span><br><span> DHODEC,</span><br><span> DREF,</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 494f280..8495608 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -44,6 +44,7 @@</span><br><span> #include <osmocom/gsm/protocol/gsm_12_21.h></span><br><span> #include <osmocom/vty/telnet_interface.h></span><br><span> #include <osmocom/vty/ports.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/logging.h></span><br><span> </span><br><span> #include <osmocom/abis/abis.h></span><br><span> #include <osmocom/bsc/abis_om2000.h></span><br><span>@@ -87,7 +88,7 @@</span><br><span> printf(" Some useful help...\n");</span><br><span> printf(" -h --help this text\n");</span><br><span> printf(" -D --daemonize Fork the process into a background daemon\n");</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" -d option --debug=DRLL:DCC:DMM:DRR:DRSL:DNM enable debugging\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -d option --debug=DRLL:DMM:DRR:DRSL:DNM enable debugging\n");</span><br><span> printf(" -s --disable-color\n");</span><br><span> printf(" -T --timestamp. Print a timestamp in the debug output.\n");</span><br><span> printf(" -c --config-file filename The config file to use.\n");</span><br><span>@@ -650,12 +651,6 @@</span><br><span> .color = "\033[1;31m",</span><br><span> .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- [DCC] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DCC",</span><br><span style="color: hsl(0, 100%, 40%);">- .description = "Layer3 Call Control (CC)",</span><br><span style="color: hsl(0, 100%, 40%);">- .color = "\033[1;32m",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span> [DMM] = {</span><br><span> .name = "DMM",</span><br><span> .description = "Layer3 Mobility Management (MM)",</span><br><span>@@ -696,11 +691,6 @@</span><br><span> .description = "Mobile Switching Center",</span><br><span> .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- [DMGCP] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DMGCP",</span><br><span style="color: hsl(0, 100%, 40%);">- .description = "Media Gateway Control Protocol",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span> [DHO] = {</span><br><span> .name = "DHO",</span><br><span> .description = "Hand-Over Process",</span><br><span>@@ -808,6 +798,8 @@</span><br><span> bsc_vty_init(bsc_gsmnet);</span><br><span> bsc_msg_lst_vty_init(tall_bsc_ctx, &access_lists, BSC_NODE);</span><br><span> ctrl_vty_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_deprecated_subsys(tall_bsc_ctx, "cc");</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_deprecated_subsys(tall_bsc_ctx, "mgcp");</span><br><span> </span><br><span> /* Initalize SS7 */</span><br><span> osmo_ss7_init();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9414">change 9414</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9414"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib4f67bb00e1d5460e643717b53f6a4d81278dc5d </div>
<div style="display:none"> Gerrit-Change-Number: 9414 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>