aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Willmann <dwillmann@sysmocom.de>2020-12-02 19:33:50 +0100
committerDaniel Willmann <dwillmann@sysmocom.de>2020-12-04 01:31:05 +0100
commite8c8ec9683d909b32f1c5474e616fe24e6ef524c (patch)
treec1cb82ea34219ce3b34664e3d78dd7903a6a8737 /src
parent55253716d24f079662e749240f6ff6ebd99cecb6 (diff)
gbproxy: Add BVC log filters
Since gbproxy doesn't use bssgp_rcvmsg from libosmocore we need to implement our own filtering. Change-Id: I4d1b57b89990945d307f27a58a7f630be0253d5b Related: SYS#5232
Diffstat (limited to 'src')
-rw-r--r--src/gbproxy/gb_proxy.c6
-rw-r--r--src/gbproxy/gb_proxy_peer.c1
-rw-r--r--src/gbproxy/gb_proxy_vty.c37
3 files changed, 43 insertions, 1 deletions
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index d8b828c6..329c1d1e 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -31,6 +31,7 @@
#include <arpa/inet.h>
#include <time.h>
+#include <osmocom/core/logging.h>
#include <osmocom/core/talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/rate_ctr.h>
@@ -1568,12 +1569,12 @@ void gprs_ns_prim_status_cb(struct gbproxy_config *cfg, struct osmo_gprs_ns2_pri
}
}
-
/* called by the ns layer */
int gprs_ns2_prim_cb(struct osmo_prim_hdr *oph, void *ctx)
{
struct osmo_gprs_ns2_prim *nsp;
struct gbproxy_config *cfg = (struct gbproxy_config *) ctx;
+ uintptr_t bvci;
int rc = 0;
if (oph->sap != SAP_NS)
@@ -1589,11 +1590,14 @@ int gprs_ns2_prim_cb(struct osmo_prim_hdr *oph, void *ctx)
switch (oph->primitive) {
case PRIM_NS_UNIT_DATA:
+
/* hand the message into the BSSGP implementation */
msgb_bssgph(oph->msg) = oph->msg->l3h;
msgb_bvci(oph->msg) = nsp->bvci;
msgb_nsei(oph->msg) = nsp->nsei;
+ bvci = nsp->bvci | BVC_LOG_CTX_FLAG;
+ log_set_context(LOG_CTX_GB_BVC, (void *)bvci);
rc = gbprox_rcvmsg(cfg, oph->msg);
msgb_free(oph->msg);
break;
diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c
index 62c4d94f..2b28dd56 100644
--- a/src/gbproxy/gb_proxy_peer.c
+++ b/src/gbproxy/gb_proxy_peer.c
@@ -25,6 +25,7 @@
#include <osmocom/sgsn/debug.h>
#include <osmocom/gprs/protocol/gsm_08_18.h>
+#include <osmocom/core/logging.h>
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/stats.h>
#include <osmocom/core/talloc.h>
diff --git a/src/gbproxy/gb_proxy_vty.c b/src/gbproxy/gb_proxy_vty.c
index caad52e6..379b8c23 100644
--- a/src/gbproxy/gb_proxy_vty.c
+++ b/src/gbproxy/gb_proxy_vty.c
@@ -39,6 +39,7 @@
#include <osmocom/sgsn/vty.h>
#include <osmocom/vty/command.h>
+#include <osmocom/vty/logging.h>
#include <osmocom/vty/vty.h>
#include <osmocom/vty/misc.h>
@@ -538,6 +539,41 @@ DEFUN(cfg_gbproxy_link_no_stored_msgs_max_len,
return CMD_SUCCESS;
}
+static void log_set_bvc_filter(struct log_target *target,
+ const uint16_t *bvci)
+{
+ if (bvci) {
+ uintptr_t bvci_filter = *bvci | BVC_LOG_CTX_FLAG;
+ target->filter_map |= (1 << LOG_FLT_GB_BVC);
+ target->filter_data[LOG_FLT_GB_BVC] = (void *)bvci_filter;
+ } else if (target->filter_data[LOG_FLT_GB_BVC]) {
+ target->filter_map = ~(1 << LOG_FLT_GB_BVC);
+ target->filter_data[LOG_FLT_GB_BVC] = NULL;
+ }
+}
+
+DEFUN(logging_fltr_bvc,
+ logging_fltr_bvc_cmd,
+ "logging filter bvc bvci <0-65535>",
+ LOGGING_STR FILTER_STR
+ "Filter based on BSSGP VC\n"
+ "Identify BVC by BVCI\n"
+ "Numeric identifier\n")
+{
+ struct log_target *tgt;
+ uint16_t id = atoi(argv[0]);
+
+ log_tgt_mutex_lock();
+ tgt = osmo_log_vty2tgt(vty);
+ if (!tgt) {
+ log_tgt_mutex_unlock();
+ return CMD_WARNING;
+ }
+
+ log_set_bvc_filter(tgt, &id);
+ log_tgt_mutex_unlock();
+ return CMD_SUCCESS;
+}
DEFUN(show_gbproxy, show_gbproxy_cmd, "show gbproxy [stats]",
SHOW_STR "Display information about the Gb proxy\n" "Show statistics\n")
@@ -881,6 +917,7 @@ int gbproxy_vty_init(void)
{
install_element_ve(&show_gbproxy_cmd);
install_element_ve(&show_gbproxy_links_cmd);
+ install_element_ve(&logging_fltr_bvc_cmd);
install_element(ENABLE_NODE, &delete_gb_bvci_cmd);
install_element(ENABLE_NODE, &delete_gb_nsei_cmd);