<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26145">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
neels: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_rsl: do not pass lchan to print_meas_rep_buf()<br><br>Change-Id: If965c7dc6b989ee758ddec0190ec1cce8363b240<br>---<br>M src/osmo-bsc/abis_rsl.c<br>1 file changed, 11 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index cdd57c2..f849d27 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -1177,21 +1177,11 @@</span><br><span> prefix, mru->full.rx_qual, prefix, mru->sub.rx_qual);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int print_meas_rep_buf(char *buf, size_t len, struct gsm_lchan *lchan, struct gsm_meas_rep *mr)</span><br><span style="color: hsl(120, 100%, 40%);">+static int print_meas_rep_buf(char *buf, size_t len, struct gsm_meas_rep *mr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- const char *name = "";</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_subscr *bsub = NULL;</span><br><span> struct osmo_strbuf sb = { .buf = buf, .len = len };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan && lchan->conn) {</span><br><span style="color: hsl(0, 100%, 40%);">- bsub = lchan->conn->bsub;</span><br><span style="color: hsl(0, 100%, 40%);">- if (bsub) {</span><br><span style="color: hsl(0, 100%, 40%);">- name = bsc_subscr_name(bsub);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- name = lchan->name;</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%);">- OSMO_STRBUF_PRINTF(sb, "[%s] MEASUREMENT RESULT NR=%d ", name, mr->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "MEASUREMENT RESULT NR=%d ", mr->nr);</span><br><span> </span><br><span> if (mr->flags & MEAS_REP_F_DL_DTX)</span><br><span> OSMO_STRBUF_PRINTF(sb, "DTXd ");</span><br><span>@@ -1222,25 +1212,30 @@</span><br><span> return sb.chars_needed;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static char *print_meas_rep_c(void *ctx, struct gsm_lchan *lchan, struct gsm_meas_rep *mr)</span><br><span style="color: hsl(120, 100%, 40%);">+static char *print_meas_rep_c(void *ctx, struct gsm_meas_rep *mr)</span><br><span> {</span><br><span> /* A naive count of required characters gets me to ~200, so 256 should be safe to get a large enough buffer on</span><br><span> * the first time. */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_NAME_C_IMPL(ctx, 256, "ERROR", print_meas_rep_buf, lchan, mr)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_NAME_C_IMPL(ctx, 256, "ERROR", print_meas_rep_buf, mr)</span><br><span> }</span><br><span> </span><br><span> static void print_meas_rep(struct gsm_lchan *lchan, struct gsm_meas_rep *mr)</span><br><span> {</span><br><span> int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *name = "";</span><br><span> struct bsc_subscr *bsub = NULL;</span><br><span> </span><br><span> if (lchan && lchan->conn) {</span><br><span> bsub = lchan->conn->bsub;</span><br><span style="color: hsl(0, 100%, 40%);">- if (bsub)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsub) {</span><br><span> log_set_context(LOG_CTX_BSC_SUBSCR, bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ name = bsc_subscr_name(bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ name = lchan->name;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMEAS, "%s\n", print_meas_rep_c(OTC_SELECT, lchan, mr));</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DMEAS, "[%s] %s\n", name, print_meas_rep_c(OTC_SELECT, mr));</span><br><span> </span><br><span> if (mr->num_cell != 7</span><br><span> && log_check_level(DMEAS, LOGL_DEBUG)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26145">change 26145</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-bsc/+/26145"/><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-Change-Id: If965c7dc6b989ee758ddec0190ec1cce8363b240 </div>
<div style="display:none"> Gerrit-Change-Number: 26145 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>