<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9230">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;">cosmetic: logging and ordering in handle_ass_compl()<br><br>* Check the message length once at the start, before any other actions.<br>* Use only one local gsm48_hdr pointer.<br>* Read the cause value once near the top, re-use it.<br>* Log "ASSIGNMENT COMPLETE" always, not only during handover.<br>* Fully initialize local struct lchan_signal_data.<br><br>Change-Id: Idcfd932d3dfb0b621ed6d8c4f92c0231abcdcec8<br>---<br>M src/libbsc/bsc_api.c<br>1 file changed, 21 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c</span><br><span>index 71cc0f0..8ae781e 100644</span><br><span>--- a/src/libbsc/bsc_api.c</span><br><span>+++ b/src/libbsc/bsc_api.c</span><br><span>@@ -344,18 +344,27 @@</span><br><span> static void handle_ass_compl(struct gsm_subscriber_connection *conn,</span><br><span>                         struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     struct gsm48_hdr *gh;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm48_hdr *gh = msgb_l3(msg);</span><br><span>         struct bsc_api *api = conn->network->bsc_api;</span><br><span style="color: hsl(120, 100%, 40%);">+   enum gsm48_rr_cause cause;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  /* Expecting gsm48_hdr + cause value */</span><br><span style="color: hsl(120, 100%, 40%);">+       if (msgb_l3len(msg) != sizeof(*gh) + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+             LOGPLCHAN(msg->lchan, DRR, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+                       "RR Assignment Complete: length invalid: %u, expected %zu\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                       msgb_l3len(msg), sizeof(*gh) + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+          return;</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%);">+   cause = gh->data[0];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT COMPLETE cause = %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                 rr_cause_name(cause));</span><br><span> </span><br><span>         if (conn->ho) {</span><br><span style="color: hsl(0, 100%, 40%);">-              struct lchan_signal_data sig;</span><br><span style="color: hsl(0, 100%, 40%);">-           struct gsm48_hdr *gh = msgb_l3(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-            LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT COMPLETE cause = %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                   rr_cause_name(gh->data[0]));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               sig.lchan = msg->lchan;</span><br><span style="color: hsl(0, 100%, 40%);">-              sig.mr = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+                struct lchan_signal_data sig = {</span><br><span style="color: hsl(120, 100%, 40%);">+                      .lchan = msg->lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+               };</span><br><span>           osmo_signal_dispatch(SS_LCHAN, S_LCHAN_ASSIGNMENT_COMPL, &sig);</span><br><span>          /* FIXME: release old channel */</span><br><span> </span><br><span>@@ -366,15 +375,8 @@</span><br><span>  }</span><br><span> </span><br><span>        if (conn->secondary_lchan != msg->lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">-                        "Assignment Compl should occur on second lchan.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                return;</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%);">-       gh = msgb_l3(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-      if (msgb_l3len(msg) - sizeof(*gh) != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">-               LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, "Assignment Compl invalid: %zu\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                   msgb_l3len(msg) - sizeof(*gh));</span><br><span style="color: hsl(120, 100%, 40%);">+             LOGPLCHAN(msg->lchan, DRR, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+                       "RR Assignment Complete does not match conn's secondary lchan.\n");</span><br><span>          return;</span><br><span>      }</span><br><span> </span><br><span>@@ -391,7 +393,7 @@</span><br><span>  if (is_ipaccess_bts(conn_get_bts(conn)) && conn->lchan->tch_mode != GSM48_CMODE_SIGN)</span><br><span>          rsl_ipacc_crcx(conn->lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     api->assign_compl(conn, gh->data[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+   api->assign_compl(conn, cause);</span><br><span> }</span><br><span> </span><br><span> static void handle_ass_fail(struct gsm_subscriber_connection *conn,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9230">change 9230</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/9230"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Idcfd932d3dfb0b621ed6d8c4f92c0231abcdcec8 </div>
<div style="display:none"> Gerrit-Change-Number: 9230 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>