<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15727">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">VTY: fix command 'show tbf all': properly filter TBFs<br><br>For a long time the VTY command to show all active TBFs was broken.<br>The TBF filtering (by allocation origin) logic allows one to show<br>TBFs allocated on CCCH, PACCH, or on both of them. In the latter<br>case we have been checking whether a TBF was allocated on both<br>logical channels at the same time.<br><br>Let's fix this by passing a flag-mask instead of boolean arguments.<br>To be able to use GPRS_RLCMAC_FLAG_* definitions from "tbf.h", let's<br>exclude them from "#ifdef __cplusplus ... #endif" block.<br><br>Change-Id: I1c9f401368af880a97d32905c4cce0da481ffc21<br>---<br>M src/pcu_vty.c<br>M src/pcu_vty_functions.cpp<br>M src/pcu_vty_functions.h<br>M src/tbf.h<br>4 files changed, 22 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index 23a42e7..996ce61 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -1165,13 +1165,14 @@</span><br><span> "TBFs allocated via PACCH\n")</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">- if (!strcmp(argv[0], "all"))</span><br><span style="color: hsl(0, 100%, 40%);">- return pcu_vty_show_tbf_all(vty, bts, true, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t flags = UINT32_MAX;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!strcmp(argv[0], "ccch"))</span><br><span style="color: hsl(0, 100%, 40%);">- return pcu_vty_show_tbf_all(vty, bts_main_data(), true, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argv[0][0] == 'c')</span><br><span style="color: hsl(120, 100%, 40%);">+ flags = (1 << GPRS_RLCMAC_FLAG_CCCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (argv[0][0] == 'p')</span><br><span style="color: hsl(120, 100%, 40%);">+ flags = (1 << GPRS_RLCMAC_FLAG_PACCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return pcu_vty_show_tbf_all(vty, bts_main_data(), false, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ return pcu_vty_show_tbf_all(vty, bts, flags);</span><br><span> }</span><br><span> </span><br><span> DEFUN(show_ms_all,</span><br><span>diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp</span><br><span>index fd8474b..7b6c84f 100644</span><br><span>--- a/src/pcu_vty_functions.cpp</span><br><span>+++ b/src/pcu_vty_functions.cpp</span><br><span>@@ -45,17 +45,11 @@</span><br><span> #include "coding_scheme.h"</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void tbf_print_vty_info(struct vty *vty, gprs_rlcmac_tbf *tbf, bool show_ccch, bool show_pacch)</span><br><span style="color: hsl(120, 100%, 40%);">+static void tbf_print_vty_info(struct vty *vty, gprs_rlcmac_tbf *tbf)</span><br><span> {</span><br><span> gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf);</span><br><span> gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (show_ccch && !(tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)))</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%);">- if (show_pacch && !(tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH)))</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> vty_out(vty, "TBF: TFI=%d TLLI=0x%08x (%s) TA=%u DIR=%s IMSI=%s%s", tbf->tfi(),</span><br><span> tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid",</span><br><span> tbf->ta(),</span><br><span>@@ -108,18 +102,22 @@</span><br><span> vty_out(vty, "%s%s", VTY_NEWLINE, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data, bool show_ccch, bool show_pacch)</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data, uint32_t flags)</span><br><span> {</span><br><span> BTS *bts = bts_data->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- LListHead<gprs_rlcmac_tbf> *ms_iter;</span><br><span style="color: hsl(120, 100%, 40%);">+ LListHead<gprs_rlcmac_tbf> *iter;</span><br><span> </span><br><span> vty_out(vty, "UL TBFs%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each(ms_iter, &bts->ul_tbfs())</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_print_vty_info(vty, ms_iter->entry(), show_ccch, show_pacch);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each(iter, &bts->ul_tbfs()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (iter->entry()->state_flags & flags)</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_print_vty_info(vty, iter->entry());</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> vty_out(vty, "%sDL TBFs%s", VTY_NEWLINE, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each(ms_iter, &bts->dl_tbfs())</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_print_vty_info(vty, ms_iter->entry(), show_ccch, show_pacch);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each(iter, &bts->dl_tbfs()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (iter->entry()->state_flags & flags)</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_print_vty_info(vty, iter->entry());</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>diff --git a/src/pcu_vty_functions.h b/src/pcu_vty_functions.h</span><br><span>index 3fef208..6fbc366 100644</span><br><span>--- a/src/pcu_vty_functions.h</span><br><span>+++ b/src/pcu_vty_functions.h</span><br><span>@@ -27,7 +27,7 @@</span><br><span> struct vty;</span><br><span> struct gprs_rlcmac_bts;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data, bool show_ccch, bool show_pacch);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data, uint32_t flags);</span><br><span> int pcu_vty_show_ms_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data);</span><br><span> int pcu_vty_show_ms_by_tlli(struct vty *vty, struct gprs_rlcmac_bts *bts_data,</span><br><span> uint32_t tlli);</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index fd65b20..9545385 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -38,6 +38,8 @@</span><br><span> class GprsMs;</span><br><span> struct gprs_rlcmac_bts;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span> * TBF instance</span><br><span> */</span><br><span>@@ -171,6 +173,8 @@</span><br><span> #define TBF_ASS_TYPE_SET(t, kind) do { t->ass_type_mod(kind, false, __FILE__, __LINE__); } while(0)</span><br><span> #define TBF_ASS_TYPE_UNSET(t, kind) do { t->ass_type_mod(kind, true, __FILE__, __LINE__); } while(0)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __cplusplus</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gprs_rlcmac_tbf {</span><br><span> gprs_rlcmac_tbf(BTS *bts_, gprs_rlcmac_tbf_direction dir);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15727">change 15727</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/+/15727"/><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: I1c9f401368af880a97d32905c4cce0da481ffc21 </div>
<div style="display:none"> Gerrit-Change-Number: 15727 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>