<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11762">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">show dynamic timeslot details in 'show timeslot' vty command<br><br>The 'show lchan' command already shows details about timeslot<br>state, indicating whether a channel is currently being switched<br>to a different channel type.<br><br>However, this information was not shown by 'show timeslot' yet.<br>There are TTCN3 BSC tests which use 'show timeslot' and are<br>seeing sporadic failures when 'show timeout' is invoked during a<br>channel type transition. With this change, VTY sessions recorded<br>in pcap files for these tests will contain information about the<br>current channel type transition state.<br><br>Change-Id: Ib854945756fb54c0e1c7d4212ea7b8746eec0db5<br>Related: OS#3690<br>---<br>M src/osmo-bsc/bsc_vty.c<br>1 file changed, 34 insertions(+), 29 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/62/11762/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 84752dd..4331ca2 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1151,6 +1151,38 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* call vty_out() to print a string like " as TCH/H" for dynamic timeslots.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Don't do anything if the ts is not dynamic. */</span><br><span style="color: hsl(120, 100%, 40%);">+static void vty_out_dyn_ts_status(struct vty *vty, struct gsm_bts_trx_ts *ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_phys_chan_config target;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts_is_pchan_switching(ts, &target)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " switching %s -> %s", gsm_pchan_name(ts->pchan_is),</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_pchan_name(target));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ts->pchan_is != ts->pchan_on_init) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " as %s", gsm_pchan_name(ts->pchan_is));</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void vty_out_dyn_ts_details(struct vty *vty, struct gsm_bts_trx_ts *ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* show dyn TS details, if applicable */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ts->pchan_on_init) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " Osmocom Dyn TS:");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out_dyn_ts_status(vty, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_F_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " IPACC Dyn PDCH TS:");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out_dyn_ts_status(vty, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* no dyn ts */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> static void ts_dump_vty(struct vty *vty, struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span>@@ -1160,6 +1192,7 @@</span><br><span> if (ts->pchan_is != ts->pchan_on_init)</span><br><span> vty_out(vty, " (%s mode)", gsm_pchan_name(ts->pchan_is));</span><br><span> vty_out(vty, ", TSC %u%s NM State: ", gsm_ts_tsc(ts), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out_dyn_ts_details(vty, ts);</span><br><span> net_dump_nmstate(vty, &ts->mo.nm_state);</span><br><span> if (!is_ipaccess_bts(ts->trx->bts))</span><br><span> vty_out(vty, " E1 Line %u, Timeslot %u, Subslot %u%s",</span><br><span>@@ -1287,19 +1320,6 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* call vty_out() to print a string like " as TCH/H" for dynamic timeslots.</span><br><span style="color: hsl(0, 100%, 40%);">- * Don't do anything if the ts is not dynamic. */</span><br><span style="color: hsl(0, 100%, 40%);">-static void vty_out_dyn_ts_status(struct vty *vty, struct gsm_bts_trx_ts *ts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm_phys_chan_config target;</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts_is_pchan_switching(ts, &target)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " switching %s -> %s", gsm_pchan_name(ts->pchan_is),</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_pchan_name(target));</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ts->pchan_is != ts->pchan_on_init) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " as %s", gsm_pchan_name(ts->pchan_is));</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%);">-</span><br><span> static void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan)</span><br><span> {</span><br><span> int idx;</span><br><span>@@ -1307,22 +1327,7 @@</span><br><span> vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u: Type %s%s",</span><br><span> lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr,</span><br><span> lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- /* show dyn TS details, if applicable */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->ts->pchan_on_init) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " Osmocom Dyn TS:");</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out_dyn_ts_status(vty, lchan->ts);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_PDCH:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " IPACC Dyn PDCH TS:");</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out_dyn_ts_status(vty, lchan->ts);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* no dyn ts */</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out_dyn_ts_details(vty, lchan->ts);</span><br><span> vty_out(vty, " Connection: %u, State: %s%s%s%s",</span><br><span> lchan->conn ? 1: 0, lchan_state_name(lchan),</span><br><span> lchan->fi && lchan->fi->state == LCHAN_ST_BORKEN ? " Error reason: " : "",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11762">change 11762</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/11762"/><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: Ib854945756fb54c0e1c7d4212ea7b8746eec0db5 </div>
<div style="display:none"> Gerrit-Change-Number: 11762 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>