<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16955">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">example/sccp_demo_user: Use osmocom logging system instead of printf<br><br>Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66<br>---<br>M examples/internal.h<br>M examples/sccp_demo_user.c<br>M examples/sccp_test_server.c<br>3 files changed, 27 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/examples/internal.h b/examples/internal.h</span><br><span>index 70b9058..ef560ed 100644</span><br><span>--- a/examples/internal.h</span><br><span>+++ b/examples/internal.h</span><br><span>@@ -5,6 +5,11 @@</span><br><span> #define SSN_TEST_ECHO 202</span><br><span> #define SSN_TEST_CALLBACK 203</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Debug Areas of the code */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ DMAIN</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_sccp_user;</span><br><span> </span><br><span> int sccp_test_user_vty_install(struct osmo_sccp_instance *inst, int ssn);</span><br><span>diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c</span><br><span>index 8cf3c33..e3f5ee0 100644</span><br><span>--- a/examples/sccp_demo_user.c</span><br><span>+++ b/examples/sccp_demo_user.c</span><br><span>@@ -58,6 +58,12 @@</span><br><span> }</span><br><span> </span><br><span> static const struct log_info_cat log_info_cat[] = {</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%);">+ .description = "sccp_demo_user specific logging",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;31m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> static const struct log_info log_info = {</span><br><span>diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c</span><br><span>index a66cb21..83b42fa 100644</span><br><span>--- a/examples/sccp_test_server.c</span><br><span>+++ b/examples/sccp_test_server.c</span><br><span>@@ -23,15 +23,15 @@</span><br><span> </span><br><span> switch (OSMO_PRIM_HDR(&scu_prim->oph)) {</span><br><span> case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION):</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s: refusing N-CONNECT.ind (local_ref=%u)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, scu_prim->u.connect.conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "refusing N-CONNECT.ind (local_ref=%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ scu_prim->u.connect.conn_id);</span><br><span> osmo_sccp_tx_disconn(scu, scu_prim->u.connect.conn_id,</span><br><span> &scu_prim->u.connect.called_addr,</span><br><span> 23);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s: Unknown primitive %u:%u\n", __func__,</span><br><span style="color: hsl(0, 100%, 40%);">- oph->primitive, oph->operation);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %u:%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ oph->primitive, oph->operation);</span><br><span> break;</span><br><span> }</span><br><span> msgb_free(oph->msg);</span><br><span>@@ -49,27 +49,27 @@</span><br><span> </span><br><span> switch (OSMO_PRIM_HDR(&scu_prim->oph)) {</span><br><span> case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION):</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s: Accepting N-CONNECT.ind (local_ref=%u)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, scu_prim->u.connect.conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "Accepting N-CONNECT.ind (local_ref=%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ scu_prim->u.connect.conn_id);</span><br><span> osmo_sccp_tx_conn_resp(scu, scu_prim->u.connect.conn_id,</span><br><span> &scu_prim->u.connect.called_addr,</span><br><span> data, data_len);</span><br><span> break;</span><br><span> case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s: Echoing N-DATA.ind (local_ref=%u)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, scu_prim->u.data.conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "Echoing N-DATA.ind (local_ref=%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ scu_prim->u.data.conn_id);</span><br><span> osmo_sccp_tx_data(scu, scu_prim->u.data.conn_id,</span><br><span> data, data_len);</span><br><span> break;</span><br><span> case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION):</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s: Echoing N-UNITDATA.ind\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "Echoing N-UNITDATA.ind\n");</span><br><span> osmo_sccp_tx_unitdata(scu, &scu_prim->u.unitdata.called_addr,</span><br><span> &scu_prim->u.unitdata.calling_addr,</span><br><span> data, data_len);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s: Unknown primitive %u:%u\n", __func__,</span><br><span style="color: hsl(0, 100%, 40%);">- oph->primitive, oph->operation);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %u:%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ oph->primitive, oph->operation);</span><br><span> break;</span><br><span> }</span><br><span> msgb_free(oph->msg);</span><br><span>@@ -87,21 +87,21 @@</span><br><span> </span><br><span> switch (OSMO_PRIM_HDR(&scu_prim->oph)) {</span><br><span> case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION):</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s: N-UNITDATA.ind: Connecting back to sender\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "N-UNITDATA.ind: Connecting back to sender\n");</span><br><span> osmo_sccp_tx_conn_req(scu, conn_id++,</span><br><span> &scu_prim->u.unitdata.called_addr,</span><br><span> &scu_prim->u.unitdata.calling_addr,</span><br><span> data, data_len);</span><br><span> break;</span><br><span> case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s: Echoing N-DATA.ind (local_ref=%u)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, scu_prim->u.data.conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "Echoing N-DATA.ind (local_ref=%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ scu_prim->u.data.conn_id);</span><br><span> osmo_sccp_tx_data(scu, scu_prim->u.data.conn_id,</span><br><span> data, data_len);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%s: Unknown primitive %u:%u\n", __func__,</span><br><span style="color: hsl(0, 100%, 40%);">- oph->primitive, oph->operation);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %u:%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ oph->primitive, oph->operation);</span><br><span> break;</span><br><span> }</span><br><span> msgb_free(oph->msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16955">change 16955</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/c/libosmo-sccp/+/16955"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 </div>
<div style="display:none"> Gerrit-Change-Number: 16955 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>