<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13176">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;">share debug.[ch] across all executables<br><br>This avoids us having to re-define log_info/log_info_cat for each<br>program.<br><br>Change-Id: I22f4f8a51b91ee09c5be26b1ed1bfca41730c577<br>---<br>M src/Makefile.am<br>M src/bankd_main.c<br>A src/debug.c<br>M src/debug.h<br>M src/remsim_client.c<br>M src/simtrace2-remsim_client.c<br>6 files changed, 24 insertions(+), 42 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index ca799ce..5f0d846 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -25,15 +25,15 @@</span><br><span> pcsc_test_LDADD = $(OSMOCORE_LIBS) \</span><br><span> $(PCSC_LIBS) libosmo-rspro.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-remsim_bankd_SOURCES = bankd_slotmap.c bankd_main.c bankd_pcsc.c</span><br><span style="color: hsl(120, 100%, 40%);">+remsim_bankd_SOURCES = bankd_slotmap.c bankd_main.c bankd_pcsc.c debug.c</span><br><span> remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) \</span><br><span> $(PCSC_LIBS) libosmo-rspro.la -lcsv</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-remsim_client_SOURCES = remsim_client.c remsim_client_fsm.c</span><br><span style="color: hsl(120, 100%, 40%);">+remsim_client_SOURCES = remsim_client.c remsim_client_fsm.c debug.c</span><br><span> remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span> libosmo-rspro.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-simtrace2_remsim_client_SOURCES = simtrace2-remsim_client.c remsim_client_fsm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+simtrace2_remsim_client_SOURCES = simtrace2-remsim_client.c remsim_client_fsm.c debug.c \</span><br><span> simtrace2/apdu_dispatch.c \</span><br><span> simtrace2/simtrace2-discovery.c \</span><br><span> simtrace2/libusb_util.c</span><br><span>diff --git a/src/bankd_main.c b/src/bankd_main.c</span><br><span>index 5e94afb..fde03cd 100644</span><br><span>--- a/src/bankd_main.c</span><br><span>+++ b/src/bankd_main.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <osmocom/rspro/RsproPDU.h></span><br><span> </span><br><span> #include "bankd.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span> #include "rspro_util.h"</span><br><span> </span><br><span> __thread void *talloc_asn1_ctx;</span><br><span>@@ -36,19 +37,6 @@</span><br><span> * bankd core / main thread</span><br><span> ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct log_info_cat default_categories[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [DMAIN] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DMAIN",</span><br><span style="color: hsl(0, 100%, 40%);">- .loglevel = LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct log_info log_info = {</span><br><span style="color: hsl(0, 100%, 40%);">- .cat = default_categories,</span><br><span style="color: hsl(0, 100%, 40%);">- .num_cat = ARRAY_SIZE(default_categories),</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int asn_debug;</span><br><span> </span><br><span> static void bankd_init(struct bankd *bankd)</span><br><span>diff --git a/src/debug.c b/src/debug.c</span><br><span>new file mode 100644</span><br><span>index 0000000..046dc8c</span><br><span>--- /dev/null</span><br><span>+++ b/src/debug.c</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct log_info_cat default_categories[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [DMAIN] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DMAIN",</span><br><span style="color: hsl(120, 100%, 40%);">+ .loglevel = LOGL_DEBUG,</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%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct log_info log_info = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .cat = default_categories,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_cat = ARRAY_SIZE(default_categories),</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span>diff --git a/src/debug.h b/src/debug.h</span><br><span>index 187d895..02551eb 100644</span><br><span>--- a/src/debug.h</span><br><span>+++ b/src/debug.h</span><br><span>@@ -3,3 +3,5 @@</span><br><span> enum {</span><br><span> DMAIN,</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct log_info log_info;</span><br><span>diff --git a/src/remsim_client.c b/src/remsim_client.c</span><br><span>index 2f740d4..0c2dcbe 100644</span><br><span>--- a/src/remsim_client.c</span><br><span>+++ b/src/remsim_client.c</span><br><span>@@ -15,6 +15,7 @@</span><br><span> </span><br><span> #include "rspro_util.h"</span><br><span> #include "client.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span> </span><br><span> static int bankd_handle_msg(struct bankd_client *bc, struct msgb *msg)</span><br><span> {</span><br><span>@@ -68,19 +69,6 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct log_info_cat default_categories[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [DMAIN] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DMAIN",</span><br><span style="color: hsl(0, 100%, 40%);">- .loglevel = LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct log_info log_info = {</span><br><span style="color: hsl(0, 100%, 40%);">- .cat = default_categories,</span><br><span style="color: hsl(0, 100%, 40%);">- .num_cat = ARRAY_SIZE(default_categories),</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct bankd_client *g_client;</span><br><span> static void *g_tall_ctx;</span><br><span> void __thread *talloc_asn1_ctx;</span><br><span>diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c</span><br><span>index 79da419..0832300 100644</span><br><span>--- a/src/simtrace2-remsim_client.c</span><br><span>+++ b/src/simtrace2-remsim_client.c</span><br><span>@@ -15,6 +15,7 @@</span><br><span> </span><br><span> #include "rspro_util.h"</span><br><span> #include "client.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span> </span><br><span> #include <unistd.h></span><br><span> #include <stdio.h></span><br><span>@@ -619,19 +620,6 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct log_info_cat default_categories[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [DMAIN] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DMAIN",</span><br><span style="color: hsl(0, 100%, 40%);">- .loglevel = LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct log_info log_info = {</span><br><span style="color: hsl(0, 100%, 40%);">- .cat = default_categories,</span><br><span style="color: hsl(0, 100%, 40%);">- .num_cat = ARRAY_SIZE(default_categories),</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void print_welcome(void)</span><br><span> {</span><br><span> printf("simtrace2-remsim-client - Remote SIM card client for SIMtrace\n"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13176">change 13176</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/13176"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I22f4f8a51b91ee09c5be26b1ed1bfca41730c577 </div>
<div style="display:none"> Gerrit-Change-Number: 13176 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>