<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13384">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Max: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_debug: Use named initializers and explicit array indicies<br><br>This is a much safe way, it allows for modifications of the debug<br>subsystem enum member values without breakage. Also, the syntax<br>introduced here is what we do in all other Osmocom CNI projects.<br><br>Change-Id: I2be88586ca44b0b8361f96cf3c034c8459244c2c<br>---<br>M src/gprs_debug.cpp<br>1 file changed, 99 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_debug.cpp b/src/gprs_debug.cpp</span><br><span>index f1ae6ad..91933a2 100644</span><br><span>--- a/src/gprs_debug.cpp</span><br><span>+++ b/src/gprs_debug.cpp</span><br><span>@@ -1,6 +1,7 @@</span><br><span> /* gprs_debug.cpp</span><br><span> *</span><br><span> * Copyright (C) 2012 Ivan Klyuchnikov</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2019 Harald Welte <laforge@gnumonks.org></span><br><span> *</span><br><span> * This program is free software; you can redistribute it and/or</span><br><span> * modify it under the terms of the GNU General Public License</span><br><span>@@ -24,20 +25,104 @@</span><br><span> /* default categories */</span><br><span> </span><br><span> static const struct log_info_cat default_categories[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {"DCSN1", "\033[1;31m", "Concrete Syntax Notation One (CSN1)", LOGL_INFO, 0},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DL1IF", "\033[1;32m", "GPRS PCU L1 interface (L1IF)", LOGL_INFO, 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DRLCMAC", "\033[0;33m", "GPRS RLC/MAC layer (RLCMAC)", LOGL_NOTICE, 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DRLCMACDATA", "\033[0;33m", "GPRS RLC/MAC layer Data (RLCMAC)", LOGL_NOTICE, 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DRLCMACDL", "\033[1;33m", "GPRS RLC/MAC layer Downlink (RLCMAC)", LOGL_NOTICE, 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DRLCMACUL", "\033[1;36m", "GPRS RLC/MAC layer Uplink (RLCMAC)", LOGL_NOTICE, 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DRLCMACSCHED", "\033[0;36m", "GPRS RLC/MAC layer Scheduling (RLCMAC)", LOGL_NOTICE, 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DRLCMACMEAS", "\033[1;31m", "GPRS RLC/MAC layer Measurements (RLCMAC)", LOGL_INFO, 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DTBF","\033[1;34m", "Temporary Block Flow (TBF)", LOGL_INFO , 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DTBFDL","\033[1;34m", "Temporary Block Flow (TBF) Downlink", LOGL_INFO , 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DTBFUL","\033[1;34m", "Temporary Block Flow (TBF) Uplink", LOGL_INFO , 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DNS","\033[1;34m", "GPRS Network Service Protocol (NS)", LOGL_INFO , 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DBSSGP","\033[1;34m", "GPRS BSS Gateway Protocol (BSSGP)", LOGL_INFO , 1},</span><br><span style="color: hsl(0, 100%, 40%);">- {"DPCU", "\033[1;35m", "GPRS Packet Control Unit (PCU)", LOGL_NOTICE, 1},</span><br><span style="color: hsl(120, 100%, 40%);">+ [DCSN1] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DCSN1",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;31m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Concrete Syntax Notation One (CSN1)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DL1IF] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DL1IF",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;32m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS PCU L1 interface (L1IF)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DRLCMAC] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DRLCMAC",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[0;33m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS RLC/MAC layer (RLCMAC)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DRLCMACDATA] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DRLCMACDATA",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[0;33m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS RLC/MAC layer Data (RLCMAC)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DRLCMACDL] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DRLCMACDL",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;33m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS RLC/MAC layer Downlink (RLCMAC)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DRLCMACUL] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DRLCMACUL",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;36m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS RLC/MAC layer Uplink (RLCMAC)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DRLCMACSCHED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DRLCMACSCHED",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[0;36m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS RLC/MAC layer Scheduling (RLCMAC)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DRLCMACMEAS] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DRLCMACMEAS",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;31m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS RLC/MAC layer Measurements (RLCMAC)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DTBF] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DTBF",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;34m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Temporary Block Flow (TBF)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DTBFDL] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DTBFDL",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;34m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Temporary Block Flow (TBF) Downlink",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DTBFUL] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DTBFUL",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;34m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Temporary Block Flow (TBF) Uplink",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DNS] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DNS",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;34m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS Network Service Protocol (NS)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DBSSGP] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DBSSGP",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;34m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS BSS Gateway Protocol (BSSGP)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DPCU] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DPCU",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;35m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS Packet Control Unit (PCU)",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> static int filter_fn(const struct log_context *ctx,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13384">change 13384</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/13384"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I2be88586ca44b0b8361f96cf3c034c8459244c2c </div>
<div style="display:none"> Gerrit-Change-Number: 13384 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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 (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>