<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10053">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;">sched: Log RX->RTP packet like we do in add_l1sap_header<br><br>Other backends use already msgb in lower layers and eventually call<br>add_l1sap_header to push TCH data up the stack.<br>backends using common/scheduler.c (bts-trx, bts-virt) are the only ones<br>not yet using msgb in lower layer but only creating the msgb<br>immediatelly before sending it in _sched_compose_tch_ind. Let's add a<br>log message there too to have similar output in all BTS backends.<br><br>Change-Id: Ia90b051f308abcd8b88b84e861da593844b0d81a<br>---<br>M src/common/scheduler.c<br>1 file changed, 7 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 8c9d30d..69186fe 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -380,14 +380,17 @@</span><br><span> {</span><br><span>   struct msgb *msg;</span><br><span>    struct osmo_phsap_prim *l1sap;</span><br><span style="color: hsl(120, 100%, 40%);">+        struct gsm_bts_trx *trx = l1t->trx;</span><br><span>       struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t chan_nr = trx_chan_desc[chan].chan_nr | tn;</span><br><span style="color: hsl(120, 100%, 40%);">+   struct gsm_lchan *lchan = &trx->ts[L1SAP_CHAN2TS(chan_nr)].lchan[l1sap_chan2ss(chan_nr)];</span><br><span> </span><br><span>         /* compose primitive */</span><br><span>      msg = l1sap_msgb_alloc(tch_len);</span><br><span>     l1sap = msgb_l1sap_prim(msg);</span><br><span>        osmo_prim_init(&l1sap->oph, SAP_GSM_PH, PRIM_TCH,</span><br><span>             PRIM_OP_INDICATION, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-       l1sap->u.tch.chan_nr = trx_chan_desc[chan].chan_nr | tn;</span><br><span style="color: hsl(120, 100%, 40%);">+   l1sap->u.tch.chan_nr = chan_nr;</span><br><span>   l1sap->u.tch.fn = fn;</span><br><span>     msg->l2h = msgb_put(msg, tch_len);</span><br><span>        if (tch_len)</span><br><span>@@ -396,6 +399,9 @@</span><br><span>   if (l1ts->chan_state[chan].lost)</span><br><span>          l1ts->chan_state[chan].lost--;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGL1S(DL1P, LOGL_DEBUG, l1t, tn, -1, l1sap->u.data.fn,</span><br><span style="color: hsl(120, 100%, 40%);">+           "%s Rx -> RTP: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+            gsm_lchan_name(lchan), osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)));</span><br><span>  /* forward primitive */</span><br><span>      l1sap_up(l1t->trx, l1sap);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10053">change 10053</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/10053"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia90b051f308abcd8b88b84e861da593844b0d81a </div>
<div style="display:none"> Gerrit-Change-Number: 10053 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>