From 4ae540695901e08aa3bfcb28af3389d53745dc5c Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 17 Feb 2017 17:18:04 +0100 Subject: logging: use central filter and ctx consts from libosmocore Change-Id: I7b41a5a26527864177c63403ad171d2987f0ff6a Depends: libosmocore change-id I5c343630020f4b108099696fd96c2111614c8067 --- src/gprs_debug.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src/gprs_debug.cpp') diff --git a/src/gprs_debug.cpp b/src/gprs_debug.cpp index 3d9b8163..6bb35eaa 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; -- cgit v1.2.3