<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19068">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Set correct GSMTAP channel type for PDTCH messages returning error<br><br>For instance, that may happen because the len of the message is not<br>filling the expect size (because padding is missing for example). Still,<br>in this case we know the channel type, so we set it so that wireshark<br>tries to decode the message as a data one.<br><br>Change-Id: Ifea94095d669b528874e64ca823a776cd6e22b4b<br>---<br>M src/pcu_l1_if.cpp<br>1 file changed, 5 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 23f6fbb..7fa82fb 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -315,6 +315,7 @@</span><br><span>     int rc;</span><br><span>      int current_fn = get_current_fn();</span><br><span>   pcu_l1_meas meas;</span><br><span style="color: hsl(120, 100%, 40%);">+     uint8_t gsmtap_chantype;</span><br><span> </span><br><span>         LOGP(DL1IF, LOGL_DEBUG, "Data indication received: sapi=%d arfcn=%d "</span><br><span>              "fn=%d cur_fn=%d block=%d data=%s\n", data_ind->sapi,</span><br><span>@@ -335,19 +336,22 @@</span><br><span>           rc = pcu_rx_data_ind_pdtch(data_ind->trx_nr, data_ind->ts_nr,</span><br><span>                  data_ind->data, data_ind->len, data_ind->fn,</span><br><span>                        &meas);</span><br><span style="color: hsl(120, 100%, 40%);">+           gsmtap_chantype = GSMTAP_CHANNEL_PDTCH;</span><br><span>              break;</span><br><span>       case PCU_IF_SAPI_BCCH:</span><br><span>               rc = pcu_rx_data_ind_bcch(data_ind->data, data_ind->len);</span><br><span style="color: hsl(120, 100%, 40%);">+               gsmtap_chantype = GSMTAP_CHANNEL_BCCH;</span><br><span>               break;</span><br><span>       default:</span><br><span>             LOGP(DL1IF, LOGL_ERROR, "Received PCU data indication with "</span><br><span>                       "unsupported sapi %d\n", data_ind->sapi);</span><br><span>               rc = -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+         gsmtap_chantype = GSMTAP_CHANNEL_UNKNOWN;</span><br><span>    }</span><br><span> </span><br><span>        if (rc < 0 && (bts->gsmtap_categ_mask & (1 <<PCU_GSMTAP_C_UL_UNKNOWN))) {</span><br><span>            gsmtap_send(bts->gsmtap, data_ind->arfcn | GSMTAP_ARFCN_F_UPLINK, data_ind->ts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">-                         GSMTAP_CHANNEL_UNKNOWN, 0, data_ind->fn, meas.rssi, meas.link_qual, data_ind->data, data_ind->len);</span><br><span style="color: hsl(120, 100%, 40%);">+                          gsmtap_chantype, 0, data_ind->fn, meas.rssi, meas.link_qual, data_ind->data, data_ind->len);</span><br><span>    }</span><br><span> </span><br><span>        return rc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19068">change 19068</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-pcu/+/19068"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifea94095d669b528874e64ca823a776cd6e22b4b </div>
<div style="display:none"> Gerrit-Change-Number: 19068 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>