<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/15550">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: add "logging filter l1-sapi"<br><br>Add VTY commands to filter by L1 SAPI. Allow to filter by multiple SAPIs<br>by running the filter command multiple times:<br><br>OsmoBTS> logging filter l1-sapi agch<br>OsmoBTS> logging filter l1-sapi pch<br><br>Related: OS#2356<br>Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889<br>---<br>M src/common/logging.c<br>M src/common/vty.c<br>2 files changed, 70 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/logging.c b/src/common/logging.c</span><br><span>index 3315a01..8340736 100644</span><br><span>--- a/src/common/logging.c</span><br><span>+++ b/src/common/logging.c</span><br><span>@@ -144,7 +144,21 @@</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int osmo_bts_filter_fn(const struct log_context *ctx, struct log_target *tgt)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *sapi = ctx->ctx[LOG_CTX_L1_SAPI];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t *sapi_mask = tgt->filter_data[LOG_FLT_L1_SAPI];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((tgt->filter_map & (1 << LOG_FLT_L1_SAPI)) != 0</span><br><span style="color: hsl(120, 100%, 40%);">+ && sapi_mask && sapi</span><br><span style="color: hsl(120, 100%, 40%);">+ && (*sapi_mask & (1 << *sapi)) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const struct log_info bts_log_info = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .filter_fn = osmo_bts_filter_fn,</span><br><span> .cat = bts_log_info_cat,</span><br><span> .num_cat = ARRAY_SIZE(bts_log_info_cat),</span><br><span> };</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 801f34c..865c236 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <netinet/in.h></span><br><span> #include <arpa/inet.h></span><br><span> #include <ctype.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/gsm/abis_nm.h></span><br><span>@@ -1600,6 +1601,45 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(logging_fltr_l1_sapi, logging_fltr_l1_sapi_cmd, "HIDDEN", "HIDDEN")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sapi = get_string_value(l1sap_common_sapi_names, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t **sapi_mask;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(sapi != -EINVAL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tgt)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi_mask = (uint16_t **)&tgt->filter_data[LOG_FLT_L1_SAPI];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!*sapi_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+ *sapi_mask = talloc(tgt, uint16_t);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ **sapi_mask |= (1 << sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+ tgt->filter_map |= (1 << LOG_FLT_L1_SAPI);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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%);">+DEFUN(no_logging_fltr_l1_sapi, no_logging_fltr_l1_sapi_cmd, "HIDDEN", "HIDDEN")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sapi = get_string_value(l1sap_common_sapi_names, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t *sapi_mask;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(sapi != -EINVAL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tgt)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tgt->filter_data[LOG_FLT_L1_SAPI])</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi_mask = (uint16_t *)tgt->filter_data[LOG_FLT_L1_SAPI];</span><br><span style="color: hsl(120, 100%, 40%);">+ *sapi_mask &= ~(1 << sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int bts_vty_init(struct gsm_bts *bts)</span><br><span> {</span><br><span> cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names,</span><br><span>@@ -1616,11 +1656,27 @@</span><br><span> NO_STR "GSMTAP SAPI\n",</span><br><span> "\n", "", 0);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ "logging filter l1-sapi (",</span><br><span style="color: hsl(120, 100%, 40%);">+ "|", ")", VTY_DO_LOWER);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGING_STR FILTER_STR "L1 SAPI\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "\n", "", 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ no_logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no logging filter l1-sapi (",</span><br><span style="color: hsl(120, 100%, 40%);">+ "|", ")", VTY_DO_LOWER);</span><br><span style="color: hsl(120, 100%, 40%);">+ no_logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR LOGGING_STR FILTER_STR "L1 SAPI\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "\n", "", 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_element_ve(&show_bts_cmd);</span><br><span> install_element_ve(&show_trx_cmd);</span><br><span> install_element_ve(&show_ts_cmd);</span><br><span> install_element_ve(&show_lchan_cmd);</span><br><span> install_element_ve(&show_lchan_summary_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&logging_fltr_l1_sapi_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&no_logging_fltr_l1_sapi_cmd);</span><br><span> </span><br><span> logging_vty_add_cmds();</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/15550">change 15550</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-bts/+/15550"/><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-Change-Id: I32d86d3d34757135b4cce59919c2fc2b67f0a889 </div>
<div style="display:none"> Gerrit-Change-Number: 15550 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>