<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21465">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: Add filtering by NSE/NSEI<br><br>Change-Id: I63c0e85f82f5d08c5a6f535da94b8648498439d2<br>Related: SYS#5232<br>---<br>M include/osmocom/core/logging.h<br>M src/gb/common_vty.c<br>M src/gb/gprs_ns2_message.c<br>M src/gb/gprs_ns2_vty.c<br>4 files changed, 69 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/21465/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h</span><br><span>index 38b465c..418a42e 100644</span><br><span>--- a/include/osmocom/core/logging.h</span><br><span>+++ b/include/osmocom/core/logging.h</span><br><span>@@ -165,6 +165,7 @@</span><br><span> LOG_CTX_BSC_SUBSCR,</span><br><span> LOG_CTX_VLR_SUBSCR,</span><br><span> LOG_CTX_L1_SAPI,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_CTX_GB_NSE,</span><br><span> _LOG_CTX_COUNT</span><br><span> };</span><br><span> </span><br><span>@@ -178,6 +179,7 @@</span><br><span> LOG_FLT_BSC_SUBSCR,</span><br><span> LOG_FLT_VLR_SUBSCR,</span><br><span> LOG_FLT_L1_SAPI,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_FLT_GB_NSE,</span><br><span> _LOG_FLT_COUNT</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/gb/common_vty.c b/src/gb/common_vty.c</span><br><span>index eb665d5..42f3404 100644</span><br><span>--- a/src/gb/common_vty.c</span><br><span>+++ b/src/gb/common_vty.c</span><br><span>@@ -40,15 +40,21 @@</span><br><span> int gprs_log_filter_fn(const struct log_context *ctx,</span><br><span> struct log_target *tar)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ const void *nse = ctx->ctx[LOG_CTX_GB_NSE];</span><br><span> const void *nsvc = ctx->ctx[LOG_CTX_GB_NSVC];</span><br><span> const void *bvc = ctx->ctx[LOG_CTX_GB_BVC];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Filter on the NS Entity */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((tar->filter_map & (1 << LOG_FLT_GB_NSE)) != 0</span><br><span style="color: hsl(120, 100%, 40%);">+ && nse && (nse == tar->filter_data[LOG_FLT_GB_NSE]))</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Filter on the NS Virtual Connection */</span><br><span> if ((tar->filter_map & (1 << LOG_FLT_GB_NSVC)) != 0</span><br><span> && nsvc && (nsvc == tar->filter_data[LOG_FLT_GB_NSVC]))</span><br><span> return 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Filter on the NS Virtual Connection */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Filter on the BSSGP Virtual Connection */</span><br><span> if ((tar->filter_map & (1 << LOG_FLT_GB_BVC)) != 0</span><br><span> && bvc && (bvc == tar->filter_data[LOG_FLT_GB_BVC]))</span><br><span> return 1;</span><br><span>diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c</span><br><span>index fac6108..69c833e 100644</span><br><span>--- a/src/gb/gprs_ns2_message.c</span><br><span>+++ b/src/gb/gprs_ns2_message.c</span><br><span>@@ -189,6 +189,7 @@</span><br><span> struct msgb *msg = gprs_ns2_msgb_alloc();</span><br><span> struct gprs_ns_hdr *nsh;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span> if (!msg)</span><br><span>@@ -212,6 +213,7 @@</span><br><span> struct gprs_ns_hdr *nsh;</span><br><span> uint16_t nsvci = osmo_htons(nsvc->nsvci);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span> ERR_IF_NSVC_USES_SNS(nsvc, "transmit NS BLOCK");</span><br><span>@@ -244,6 +246,7 @@</span><br><span> struct gprs_ns_hdr *nsh;</span><br><span> uint16_t nsvci = osmo_htons(nsvc->nsvci);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span> ERR_IF_NSVC_USES_SNS(nsvc, "transmit NS BLOCK ACK");</span><br><span>@@ -275,6 +278,7 @@</span><br><span> uint16_t nsvci = osmo_htons(nsvc->nsvci);</span><br><span> uint16_t nsei = osmo_htons(nsvc->nse->nsei);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span> ERR_IF_NSVC_USES_SNS(nsvc, "transmit NS RESET");</span><br><span>@@ -307,6 +311,7 @@</span><br><span> uint16_t nsvci, nsei;</span><br><span> </span><br><span> /* Section 9.2.6 */</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span> ERR_IF_NSVC_USES_SNS(nsvc, "transmit NS RESET ACK");</span><br><span>@@ -337,6 +342,7 @@</span><br><span> * \returns 0 in case of success */</span><br><span> int ns2_tx_unblock(struct gprs_ns2_vc *nsvc)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span> ERR_IF_NSVC_USES_SNS(nsvc, "transmit NS UNBLOCK");</span><br><span>@@ -353,6 +359,7 @@</span><br><span> * \returns 0 in case of success */</span><br><span> int ns2_tx_unblock_ack(struct gprs_ns2_vc *nsvc)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span> ERR_IF_NSVC_USES_SNS(nsvc, "transmit NS UNBLOCK ACK");</span><br><span>@@ -368,6 +375,7 @@</span><br><span> * \returns 0 in case of success */</span><br><span> int ns2_tx_alive(struct gprs_ns2_vc *nsvc)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> LOGP(DLNS, LOGL_DEBUG, "NSEI=%u Tx NS ALIVE (NSVCI=%u)\n",</span><br><span> nsvc->nse->nsei, nsvc->nsvci);</span><br><span>@@ -380,6 +388,7 @@</span><br><span> * \returns 0 in case of success */</span><br><span> int ns2_tx_alive_ack(struct gprs_ns2_vc *nsvc)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> LOGP(DLNS, LOGL_DEBUG, "NSEI=%u Tx NS ALIVE_ACK (NSVCI=%u)\n",</span><br><span> nsvc->nse->nsei, nsvc->nsvci);</span><br><span>@@ -399,6 +408,7 @@</span><br><span> {</span><br><span> struct gprs_ns_hdr *nsh;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span> msg->l2h = msgb_push(msg, sizeof(*nsh) + 3);</span><br><span>@@ -430,6 +440,7 @@</span><br><span> struct gprs_ns_hdr *nsh;</span><br><span> uint16_t nsvci = osmo_htons(nsvc->nsvci);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span> bvci = osmo_htons(bvci);</span><br><span>@@ -495,6 +506,7 @@</span><br><span> </span><br><span> msg = gprs_ns2_msgb_alloc();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> if (!msg)</span><br><span> return -ENOMEM;</span><br><span>@@ -553,6 +565,7 @@</span><br><span> </span><br><span> msg = gprs_ns2_msgb_alloc();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> if (!msg)</span><br><span> return -ENOMEM;</span><br><span>@@ -601,6 +614,7 @@</span><br><span> return -1;</span><br><span> </span><br><span> msg = gprs_ns2_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> if (!msg)</span><br><span> return -ENOMEM;</span><br><span>@@ -646,6 +660,7 @@</span><br><span> </span><br><span> msg = gprs_ns2_msgb_alloc();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> if (!msg)</span><br><span> return -ENOMEM;</span><br><span>@@ -685,6 +700,7 @@</span><br><span> struct gprs_ns_hdr *nsh;</span><br><span> uint16_t nsei;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span> log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> if (!msg)</span><br><span> return -ENOMEM;</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 97becf6..f41620f 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -110,6 +110,18 @@</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void log_set_nse_filter(struct log_target *target,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse) {</span><br><span style="color: hsl(120, 100%, 40%);">+ target->filter_map |= (1 << LOG_FLT_GB_NSE);</span><br><span style="color: hsl(120, 100%, 40%);">+ target->filter_data[LOG_FLT_GB_NSE] = nse;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (target->filter_data[LOG_FLT_GB_NSE]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ target->filter_map = ~(1 << LOG_FLT_GB_NSE);</span><br><span style="color: hsl(120, 100%, 40%);">+ target->filter_data[LOG_FLT_GB_NSE] = NULL;</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> static void log_set_nsvc_filter(struct log_target *target,</span><br><span> struct gprs_ns2_vc *nsvc)</span><br><span> {</span><br><span>@@ -745,7 +757,37 @@</span><br><span> </span><br><span> /* TODO: allow vty to reset/block/unblock nsvc/nsei */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TODO: add filter for NSEI as ns1 code does */</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(logging_fltr_nse,</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_fltr_nse_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "logging filter nse nsei <0-65535>",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGING_STR FILTER_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Filter based on NS Entity\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Identify NSE by NSEI\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Numeric identifier\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct log_target *tgt;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t id = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_lock();</span><br><span style="color: hsl(120, 100%, 40%);">+ tgt = osmo_log_vty2tgt(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tgt) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_nse_by_nsei(vty_nsi, id);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nse) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "No NSE by that identifier%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_nse_filter(tgt, nse);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_tgt_mutex_unlock();</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> /* TODO: add filter for single connection by description */</span><br><span> DEFUN(logging_fltr_nsvc,</span><br><span> logging_fltr_nsvc_cmd,</span><br><span>@@ -806,6 +848,7 @@</span><br><span> install_lib_element_ve(&show_ns_entities_cmd);</span><br><span> install_lib_element_ve(&show_ns_pers_cmd);</span><br><span> install_lib_element_ve(&show_nse_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element_ve(&logging_fltr_nse_cmd);</span><br><span> install_lib_element_ve(&logging_fltr_nsvc_cmd);</span><br><span> </span><br><span> install_lib_element(ENABLE_NODE, &nsvc_force_unconf_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21465">change 21465</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/libosmocore/+/21465"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I63c0e85f82f5d08c5a6f535da94b8648498439d2 </div>
<div style="display:none"> Gerrit-Change-Number: 21465 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>