aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-02-17 17:18:04 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-02-17 17:23:36 +0100
commit4ae540695901e08aa3bfcb28af3389d53745dc5c (patch)
tree63631aae716f09e70479fde4733625b9475bfd80
parentb609190369bdf96eefedacc012503d7b55823302 (diff)
logging: use central filter and ctx consts from libosmocore
-rw-r--r--src/gprs_bssgp_pcu.cpp2
-rw-r--r--src/gprs_debug.cpp19
-rw-r--r--src/gprs_debug.h14
3 files changed, 7 insertions, 28 deletions
diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp
index da1d26c..f07b3a6 100644
--- a/src/gprs_bssgp_pcu.cpp
+++ b/src/gprs_bssgp_pcu.cpp
@@ -365,7 +365,7 @@ static int gprs_bssgp_pcu_rcvmsg(struct msgb *msg)
if (bctx)
{
- log_set_context(BSC_CTX_BVC, bctx);
+ log_set_context(LOGGING_CTX_GB_BVC, bctx);
rate_ctr_inc(&bctx->ctrg->ctr[BSSGP_CTR_PKTS_IN]);
rate_ctr_add(&bctx->ctrg->ctr[BSSGP_CTR_BYTES_IN], msgb_bssgp_len(msg));
}
diff --git a/src/gprs_debug.cpp b/src/gprs_debug.cpp
index 3d9b816..6bb35ea 100644
--- a/src/gprs_debug.cpp
+++ b/src/gprs_debug.cpp
@@ -46,27 +46,20 @@ static const struct log_info_cat default_categories[] = {
{"DPCU", "\033[1;35m", "GPRS Packet Control Unit (PCU)", LOGL_NOTICE, 1},
};
-enum {
- _FLT_ALL = LOG_FILTER_ALL, /* libosmocore */
- FLT_IMSI = 1,
- FLT_NSVC = 2,
- FLT_BVC = 3,
-};
-
static int filter_fn(const struct log_context *ctx,
struct log_target *tar)
{
- const struct gprs_nsvc *nsvc = (const struct gprs_nsvc*)ctx->ctx[BSC_CTX_NSVC];
- const struct gprs_nsvc *bvc = (const struct gprs_nsvc*)ctx->ctx[BSC_CTX_BVC];
+ const struct gprs_nsvc *nsvc = (const struct gprs_nsvc*)ctx->ctx[LOGGING_CTX_GB_NSVC];
+ const struct gprs_nsvc *bvc = (const struct gprs_nsvc*)ctx->ctx[LOGGING_CTX_GB_BVC];
/* Filter on the NS Virtual Connection */
- if ((tar->filter_map & (1 << FLT_NSVC)) != 0
- && nsvc && (nsvc == tar->filter_data[FLT_NSVC]))
+ if ((tar->filter_map & (1 << LOGGING_FILTER_GB_NSVC)) != 0
+ && nsvc && (nsvc == tar->filter_data[LOGGING_FILTER_GB_NSVC]))
return 1;
/* Filter on the BVC */
- if ((tar->filter_map & (1 << FLT_BVC)) != 0
- && bvc && (bvc == tar->filter_data[FLT_BVC]))
+ if ((tar->filter_map & (1 << LOGGING_FILTER_GB_BVC)) != 0
+ && bvc && (bvc == tar->filter_data[LOGGING_FILTER_GB_BVC]))
return 1;
return 0;
diff --git a/src/gprs_debug.h b/src/gprs_debug.h
index 963d841..817c41e 100644
--- a/src/gprs_debug.h
+++ b/src/gprs_debug.h
@@ -45,20 +45,6 @@ enum {
aDebug_LastEntry
};
-/* context */
-#define BSC_CTX_SUBSCR 1
-#define BSC_CTX_NSVC 4
-#define BSC_CTX_BVC 5
-
-/* target */
-
-enum {
- //DEBUG_FILTER_ALL = 1 << 0,
- LOG_FILTER_IMSI = 1 << 1,
- LOG_FILTER_NSVC = 1 << 2,
- LOG_FILTER_BVC = 1 << 3,
-};
-
/* we don't need a header dependency for this... */
struct gprs_nsvc;