<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11297">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;">l1sap: Log name of chan_nr instead of hex value<br><br>Change-Id: If98e130d17f1d153a13ba28f48a0a563731fde41<br>---<br>M src/common/l1sap.c<br>1 file changed, 27 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 0f3cd3a..8029c88 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -32,6 +32,7 @@</span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/gsm/l1sap.h></span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/rsl.h></span><br><span> #include <osmocom/core/gsmtap.h></span><br><span> #include <osmocom/core/gsmtap_util.h></span><br><span> #include <osmocom/core/utils.h></span><br><span>@@ -554,7 +555,7 @@</span><br><span> lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr);</span><br><span> if (!lchan) {</span><br><span> LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn,</span><br><span style="color: hsl(0, 100%, 40%);">- "No lchan for MPH INFO MEAS IND (chan_nr=0x%02x)\n", info_meas_ind->chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ "No lchan for MPH INFO MEAS IND (chan_nr=%s)\n", rsl_chan_nr_str(info_meas_ind->chan_nr));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -618,8 +619,8 @@</span><br><span> {</span><br><span> struct gsm_lchan *lchan;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_INFO, "activate confirm chan_nr=0x%02x trx=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- info_act_cnf->chan_nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_INFO, "activate confirm chan_nr=%s trx=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_chan_nr_str(info_act_cnf->chan_nr), trx->nr);</span><br><span> </span><br><span> lchan = get_lchan_by_chan_nr(trx, info_act_cnf->chan_nr);</span><br><span> </span><br><span>@@ -643,8 +644,8 @@</span><br><span> {</span><br><span> struct gsm_lchan *lchan;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_INFO, "deactivate confirm chan_nr=0x%02x trx=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- info_act_cnf->chan_nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_INFO, "deactivate confirm chan_nr=%s trx=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_chan_nr_str(info_act_cnf->chan_nr), trx->nr);</span><br><span> </span><br><span> lchan = get_lchan_by_chan_nr(trx, info_act_cnf->chan_nr);</span><br><span> </span><br><span>@@ -748,7 +749,7 @@</span><br><span> </span><br><span> gsm_fn2gsmtime(&g_time, fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPGT(DL1P, &g_time, "Rx PH-RTS.ind chan_nr=0x%02x link_id=0x%02xd\n", chan_nr, link_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "Rx PH-RTS.ind chan_nr=%s link_id=0x%02xd\n", rsl_chan_nr_str(chan_nr), link_id);</span><br><span> </span><br><span> /* reuse PH-RTS.ind for PH-DATA.req */</span><br><span> if (!msg) {</span><br><span>@@ -792,7 +793,8 @@</span><br><span> } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */</span><br><span> lchan = get_active_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_chan_nr_str(chan_nr));</span><br><span> return 0;</span><br><span> }</span><br><span> if (L1SAP_IS_LINK_SACCH(link_id)) {</span><br><span>@@ -851,7 +853,7 @@</span><br><span> memcpy(p, fill_frame, GSM_MACBLOCK_LEN);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=0x%02x link_id=0x%02x\n", chan_nr, link_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=%s link_id=0x%02x\n", rsl_chan_nr_str(chan_nr), link_id);</span><br><span> </span><br><span> l1sap_down(trx, l1sap);</span><br><span> </span><br><span>@@ -917,11 +919,11 @@</span><br><span> </span><br><span> gsm_fn2gsmtime(&g_time, fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPGT(DL1P, &g_time, "Rx TCH-RTS.ind chan_nr=0x%02x\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "Rx TCH-RTS.ind chan_nr=%s\n", rsl_chan_nr_str(chan_nr));</span><br><span> </span><br><span> lchan = get_active_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%s)\n", rsl_chan_nr_str(chan_nr));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -971,7 +973,7 @@</span><br><span> resp_l1sap->u.tch.fn = fn;</span><br><span> resp_l1sap->u.tch.marker = marker;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPGT(DL1P, &g_time, "Tx TCH.req chan_nr=0x%02x\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "Tx TCH.req chan_nr=%s\n", rsl_chan_nr_str(chan_nr));</span><br><span> </span><br><span> l1sap_down(trx, resp_l1sap);</span><br><span> </span><br><span>@@ -1073,13 +1075,13 @@</span><br><span> </span><br><span> gsm_fn2gsmtime(&g_time, fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=0x%02x link_id=0x%02x len=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- chan_nr, link_id, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=%s link_id=0x%02x len=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_chan_nr_str(chan_nr), link_id, len);</span><br><span> </span><br><span> if (ts_is_pdch(&trx->ts[tn])) {</span><br><span> lchan = get_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%s\n", rsl_chan_nr_str(chan_nr));</span><br><span> if (lchan && lchan->loopback && !L1SAP_IS_PTCCH(fn)) {</span><br><span> /* we are in loopback mode (for BER testing)</span><br><span> * mode and need to enqeue the frame to be</span><br><span>@@ -1115,7 +1117,7 @@</span><br><span> </span><br><span> lchan = get_active_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%s\n", rsl_chan_nr_str(chan_nr));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1179,11 +1181,11 @@</span><br><span> </span><br><span> gsm_fn2gsmtime(&g_time, fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_INFO, &g_time, "Rx TCH.ind chan_nr=0x%02x\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_INFO, &g_time, "Rx TCH.ind chan_nr=%s\n", rsl_chan_nr_str(chan_nr));</span><br><span> </span><br><span> lchan = get_active_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=0x%02x)\n", chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=%s)\n", rsl_chan_nr_str(chan_nr));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1465,8 +1467,8 @@</span><br><span> struct gsm48_chan_desc *cd;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_INFO, "activating channel chan_nr=0x%02x trx=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- chan_nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_INFO, "activating channel chan_nr=%s trx=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_chan_nr_str(chan_nr), trx->nr);</span><br><span> </span><br><span> /* osmo-pcu calls this without a valid 'tp' parameter, so we</span><br><span> * need to make sure ew don't crash here */</span><br><span>@@ -1513,8 +1515,8 @@</span><br><span> int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_INFO, "deactivating channel chan_nr=0x%02x trx=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- chan_nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_INFO, "deactivating channel chan_nr=%s trx=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_chan_nr_str(chan_nr), trx->nr);</span><br><span> </span><br><span> if (lchan->tch.dtx.dl_amr_fsm) {</span><br><span> osmo_fsm_inst_free(lchan->tch.dtx.dl_amr_fsm);</span><br><span>@@ -1529,8 +1531,8 @@</span><br><span> {</span><br><span> struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_INFO, "deactivating sacch chan_nr=0x%02x trx=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- chan_nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_INFO, "deactivating sacch chan_nr=%s trx=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_chan_nr_str(chan_nr), trx->nr);</span><br><span> </span><br><span> lchan->sacch_deact = 1;</span><br><span> </span><br><span>@@ -1540,8 +1542,8 @@</span><br><span> </span><br><span> int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_INFO, "modifying channel chan_nr=0x%02x trx=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- chan_nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_INFO, "modifying channel chan_nr=%s trx=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_chan_nr_str(chan_nr), trx->nr);</span><br><span> </span><br><span> return l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_MODIFY, 0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11297">change 11297</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/11297"/><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: If98e130d17f1d153a13ba28f48a0a563731fde41 </div>
<div style="display:none"> Gerrit-Change-Number: 11297 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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 (1000002) </div>