<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21495">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;">gbproxy: Add BVC log filters<br><br>Since gbproxy doesn't use bssgp_rcvmsg from libosmocore we need to<br>implement our own filtering.<br><br>Change-Id: I4d1b57b89990945d307f27a58a7f630be0253d5b<br>Related: SYS#5232<br>---<br>M include/osmocom/sgsn/gb_proxy.h<br>M src/gbproxy/gb_proxy.c<br>M src/gbproxy/gb_proxy_peer.c<br>M src/gbproxy/gb_proxy_vty.c<br>4 files changed, 46 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h</span><br><span>index fae95c1..b3a9a6c 100644</span><br><span>--- a/include/osmocom/sgsn/gb_proxy.h</span><br><span>+++ b/include/osmocom/sgsn/gb_proxy.h</span><br><span>@@ -15,6 +15,9 @@</span><br><span> </span><br><span> #define GBPROXY_INIT_VU_GEN_TX 256</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* BVCI uses 16 bits */</span><br><span style="color: hsl(120, 100%, 40%);">+#define BVC_LOG_CTX_FLAG (1<<17)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct rate_ctr_group;</span><br><span> struct gprs_gb_parse_context;</span><br><span> struct tlv_parsed;</span><br><span>diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>index d8b828c..329c1d1 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -31,6 +31,7 @@</span><br><span> #include <arpa/inet.h></span><br><span> #include <time.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span>@@ -1568,12 +1569,12 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* called by the ns layer */</span><br><span> int gprs_ns2_prim_cb(struct osmo_prim_hdr *oph, void *ctx)</span><br><span> {</span><br><span> struct osmo_gprs_ns2_prim *nsp;</span><br><span> struct gbproxy_config *cfg = (struct gbproxy_config *) ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ uintptr_t bvci;</span><br><span> int rc = 0;</span><br><span> </span><br><span> if (oph->sap != SAP_NS)</span><br><span>@@ -1589,11 +1590,14 @@</span><br><span> </span><br><span> switch (oph->primitive) {</span><br><span> case PRIM_NS_UNIT_DATA:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* hand the message into the BSSGP implementation */</span><br><span> msgb_bssgph(oph->msg) = oph->msg->l3h;</span><br><span> msgb_bvci(oph->msg) = nsp->bvci;</span><br><span> msgb_nsei(oph->msg) = nsp->nsei;</span><br><span style="color: hsl(120, 100%, 40%);">+ bvci = nsp->bvci | BVC_LOG_CTX_FLAG;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_GB_BVC, (void *)bvci);</span><br><span> rc = gbprox_rcvmsg(cfg, oph->msg);</span><br><span> msgb_free(oph->msg);</span><br><span> break;</span><br><span>diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c</span><br><span>index 62c4d94..2b28dd5 100644</span><br><span>--- a/src/gbproxy/gb_proxy_peer.c</span><br><span>+++ b/src/gbproxy/gb_proxy_peer.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span> #include <osmocom/sgsn/debug.h></span><br><span> </span><br><span> #include <osmocom/gprs/protocol/gsm_08_18.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span> #include <osmocom/core/stats.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span>diff --git a/src/gbproxy/gb_proxy_vty.c b/src/gbproxy/gb_proxy_vty.c</span><br><span>index caad52e..379b8c2 100644</span><br><span>--- a/src/gbproxy/gb_proxy_vty.c</span><br><span>+++ b/src/gbproxy/gb_proxy_vty.c</span><br><span>@@ -39,6 +39,7 @@</span><br><span> #include <osmocom/sgsn/vty.h></span><br><span> </span><br><span> #include <osmocom/vty/command.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/logging.h></span><br><span> #include <osmocom/vty/vty.h></span><br><span> #include <osmocom/vty/misc.h></span><br><span> </span><br><span>@@ -538,6 +539,41 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void log_set_bvc_filter(struct log_target *target,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint16_t *bvci)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bvci) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uintptr_t bvci_filter = *bvci | BVC_LOG_CTX_FLAG;</span><br><span style="color: hsl(120, 100%, 40%);">+ target->filter_map |= (1 << LOG_FLT_GB_BVC);</span><br><span style="color: hsl(120, 100%, 40%);">+ target->filter_data[LOG_FLT_GB_BVC] = (void *)bvci_filter;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (target->filter_data[LOG_FLT_GB_BVC]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ target->filter_map = ~(1 << LOG_FLT_GB_BVC);</span><br><span style="color: hsl(120, 100%, 40%);">+ target->filter_data[LOG_FLT_GB_BVC] = 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 style="color: hsl(120, 100%, 40%);">+DEFUN(logging_fltr_bvc,</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_fltr_bvc_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "logging filter bvc bvci <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 BSSGP VC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Identify BVC by BVCI\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%);">+ uint16_t id = atoi(argv[0]);</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%);">+ log_set_bvc_filter(tgt, &id);</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> </span><br><span> DEFUN(show_gbproxy, show_gbproxy_cmd, "show gbproxy [stats]",</span><br><span> SHOW_STR "Display information about the Gb proxy\n" "Show statistics\n")</span><br><span>@@ -881,6 +917,7 @@</span><br><span> {</span><br><span> install_element_ve(&show_gbproxy_cmd);</span><br><span> install_element_ve(&show_gbproxy_links_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&logging_fltr_bvc_cmd);</span><br><span> </span><br><span> install_element(ENABLE_NODE, &delete_gb_bvci_cmd);</span><br><span> install_element(ENABLE_NODE, &delete_gb_nsei_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21495">change 21495</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-sgsn/+/21495"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4d1b57b89990945d307f27a58a7f630be0253d5b </div>
<div style="display:none"> Gerrit-Change-Number: 21495 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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>