<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9282">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">log: fix logging in rsl_rx_chan_act_nack()<br><br>In each code path within rsl_rx_chan_act_nack(), do separate logging of the<br>NACK to ensure proper termination of each log line.<br><br>When receiving a Chan Act NACK, we possibly mixed a LOGP() within an<br>unterminated other LOGP() that had not been ended with a LOGPC() yet.<br><br>Change-Id: Icd2772b21ef3a2ff5af11b7c92dff0ecb4d87ff0<br>---<br>M src/libbsc/abis_rsl.c<br>1 file changed, 9 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/9282/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c</span><br><span>index ffbf630..39de1b7 100644</span><br><span>--- a/src/libbsc/abis_rsl.c</span><br><span>+++ b/src/libbsc/abis_rsl.c</span><br><span>@@ -1328,18 +1328,21 @@</span><br><span>            return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   LOGP(DRSL, LOGL_ERROR, "%s CHANNEL ACTIVATE NACK ",</span><br><span style="color: hsl(0, 100%, 40%);">-           gsm_lchan_name(msg->lchan));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>      /* BTS has rejected channel activation ?!? */</span><br><span style="color: hsl(0, 100%, 40%);">-   if (dh->ie_chan != RSL_IE_CHAN_NR)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dh->ie_chan != RSL_IE_CHAN_NR) {</span><br><span style="color: hsl(120, 100%, 40%);">+               LOGP(DRSL, LOGL_ERROR, "%s CHANNEL ACTIVATE NACK, and chan nr mismatches\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                     gsm_lchan_name(msg->lchan));</span><br><span>                 return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span> </span><br><span>        rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh));</span><br><span>    if (TLVP_PRESENT(&tp, RSL_IE_CAUSE)) {</span><br><span>           const uint8_t *cause = TLVP_VAL(&tp, RSL_IE_CAUSE);</span><br><span style="color: hsl(120, 100%, 40%);">+               LOGP(DRSL, LOGL_ERROR, "%s CHANNEL ACTIVATE NACK: ",</span><br><span style="color: hsl(120, 100%, 40%);">+                     gsm_lchan_name(msg->lchan));</span><br><span>                 print_rsl_cause(LOGL_ERROR, cause,</span><br><span>                           TLVP_LEN(&tp, RSL_IE_CAUSE));</span><br><span style="color: hsl(120, 100%, 40%);">+             LOGPC(DRSL, LOGL_ERROR, "\n");</span><br><span>             msg->lchan->error_cause = *cause;</span><br><span>              if (*cause != RSL_ERR_RCH_ALR_ACTV_ALLOC) {</span><br><span>                  rsl_lchan_mark_broken(msg->lchan, "NACK on activation");</span><br><span>@@ -1347,11 +1350,11 @@</span><br><span>                      rsl_rf_chan_release(msg->lchan, 1, SACCH_DEACTIVATE);</span><br><span> </span><br><span>         } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGP(DRSL, LOGL_ERROR, "%s CHANNEL ACTIVATE NACK, no cause IE\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                gsm_lchan_name(msg->lchan));</span><br><span>                 rsl_lchan_mark_broken(msg->lchan, "NACK on activation no IE");</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   LOGPC(DRSL, LOGL_ERROR, "\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     send_lchan_signal(S_LCHAN_ACTIVATE_NACK, msg->lchan, NULL);</span><br><span>       return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9282">change 9282</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/9282"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Icd2772b21ef3a2ff5af11b7c92dff0ecb4d87ff0 </div>
<div style="display:none"> Gerrit-Change-Number: 9282 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>