<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/26467">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bankd_main: Improve log usefulness<br><br>Right now we get duplicate log lines like<br><br>[000 CONN_CLIENT_MAPPED_CARD] bankd_main.c:662 Rx RSPRO tpduModemToCard<br>[000 CONN_CLIENT_MAPPED_CARD] bankd_main.c:623 tpduModemToCard(0070000001)<br><br>Where the first line is printed by the generic receive handler for RSPRO<br>messages, while the second line is from the specific handler function<br>handling the specific message type.<br><br>Let's only print from the generic message handler if no specific<br>handler function exists.<br><br>Change-Id: I992c847e0081bd1cd8a0b70212618c4980d9db81<br>---<br>M src/bankd/bankd_main.c<br>1 file changed, 6 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c</span><br><span>index ce34ac2..ecfa22d 100644</span><br><span>--- a/src/bankd/bankd_main.c</span><br><span>+++ b/src/bankd/bankd_main.c</span><br><span>@@ -645,7 +645,7 @@</span><br><span> </span><br><span> OSMO_ASSERT(pdu->msg.present == RsproPDUchoice_PR_connectClientReq);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGW(worker, "connectClientReq(T=%lu, N='%s', SW='%s', VER='%s')\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGW(worker, "Rx RSPRO connectClientReq(T=%lu, N='%s', SW='%s', VER='%s')\n",</span><br><span> cid->type, cid->name.buf, cid->software.buf, cid->swVersion.buf);</span><br><span> /* FIXME: store somewhere? */</span><br><span> </span><br><span>@@ -698,7 +698,8 @@</span><br><span> struct bank_slot bslot;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGW(worker, "tpduModemToCard(%s)\n", osmo_hexdump_nospc(mdm2sim->data.buf, mdm2sim->data.size));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGW(worker, "Rx RSPRO tpduModemToCard(%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump_nospc(mdm2sim->data.buf, mdm2sim->data.size));</span><br><span> </span><br><span> if (worker->state != BW_ST_CONN_CLIENT_MAPPED_CARD) {</span><br><span> LOGW(worker, "Unexpected tpduModemToCaard\n");</span><br><span>@@ -738,7 +739,7 @@</span><br><span> const struct SlotPhysStatus *sps = &cssi->slotPhysStatus;</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGW(worker, "clientSlotStatusInd(RST=%s, VCC=%s, CLK=%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGW(worker, "Rx RSPRO clientSlotStatusInd(RST=%s, VCC=%s, CLK=%s)\n",</span><br><span> sps->resetActive ? "ACTIVE" : "INACTIVE",</span><br><span> sps->vccPresent ? *sps->vccPresent ? "PRESENT" : "ABSENT" : "NULL",</span><br><span> sps->clkActive ? *sps->clkActive ? "ACTIVE" : "INACTIVE" : "NULL");</span><br><span>@@ -757,8 +758,6 @@</span><br><span> {</span><br><span> int rc = -100;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGW(worker, "Rx RSPRO %s\n", rspro_msgt_name(pdu));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> switch (pdu->msg.present) {</span><br><span> case RsproPDUchoice_PR_connectClientReq:</span><br><span> rc = worker_handle_connectClientReq(worker, pdu);</span><br><span>@@ -771,9 +770,11 @@</span><br><span> rc = 0;</span><br><span> break;</span><br><span> case RsproPDUchoice_PR_setAtrRes:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGW(worker, "Rx RSPRO %s\n", rspro_msgt_name(pdu));</span><br><span> rc = 0;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGW(worker, "Rx RSPRO %s (unhandled)\n", rspro_msgt_name(pdu));</span><br><span> rc = -101;</span><br><span> break;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/26467">change 26467</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/osmo-remsim/+/26467"/><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-Change-Id: I992c847e0081bd1cd8a0b70212618c4980d9db81 </div>
<div style="display:none"> Gerrit-Change-Number: 26467 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>