logging: use central filter and ctx consts from libosmocore
Change-Id: I7b41a5a26527864177c63403ad171d2987f0ff6a Depends: libosmocore change-id I5c343630020f4b108099696fd96c2111614c8067
This commit is contained in:
parent
b609190369
commit
4ae5406959
|
@ -365,7 +365,7 @@ static int gprs_bssgp_pcu_rcvmsg(struct msgb *msg)
|
||||||
|
|
||||||
if (bctx)
|
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_inc(&bctx->ctrg->ctr[BSSGP_CTR_PKTS_IN]);
|
||||||
rate_ctr_add(&bctx->ctrg->ctr[BSSGP_CTR_BYTES_IN], msgb_bssgp_len(msg));
|
rate_ctr_add(&bctx->ctrg->ctr[BSSGP_CTR_BYTES_IN], msgb_bssgp_len(msg));
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,27 +46,20 @@ static const struct log_info_cat default_categories[] = {
|
||||||
{"DPCU", "\033[1;35m", "GPRS Packet Control Unit (PCU)", LOGL_NOTICE, 1},
|
{"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,
|
static int filter_fn(const struct log_context *ctx,
|
||||||
struct log_target *tar)
|
struct log_target *tar)
|
||||||
{
|
{
|
||||||
const struct gprs_nsvc *nsvc = (const struct gprs_nsvc*)ctx->ctx[BSC_CTX_NSVC];
|
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[BSC_CTX_BVC];
|
const struct gprs_nsvc *bvc = (const struct gprs_nsvc*)ctx->ctx[LOGGING_CTX_GB_BVC];
|
||||||
|
|
||||||
/* Filter on the NS Virtual Connection */
|
/* Filter on the NS Virtual Connection */
|
||||||
if ((tar->filter_map & (1 << FLT_NSVC)) != 0
|
if ((tar->filter_map & (1 << LOGGING_FILTER_GB_NSVC)) != 0
|
||||||
&& nsvc && (nsvc == tar->filter_data[FLT_NSVC]))
|
&& nsvc && (nsvc == tar->filter_data[LOGGING_FILTER_GB_NSVC]))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
/* Filter on the BVC */
|
/* Filter on the BVC */
|
||||||
if ((tar->filter_map & (1 << FLT_BVC)) != 0
|
if ((tar->filter_map & (1 << LOGGING_FILTER_GB_BVC)) != 0
|
||||||
&& bvc && (bvc == tar->filter_data[FLT_BVC]))
|
&& bvc && (bvc == tar->filter_data[LOGGING_FILTER_GB_BVC]))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -45,20 +45,6 @@ enum {
|
||||||
aDebug_LastEntry
|
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... */
|
/* we don't need a header dependency for this... */
|
||||||
|
|
||||||
struct gprs_nsvc;
|
struct gprs_nsvc;
|
||||||
|
|
Loading…
Reference in New Issue