pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41883?usp=email )
Change subject: gb: Avoid accessing struct log_target members directly ......................................................................
gb: Avoid accessing struct log_target members directly
Change-Id: Idb2f7f3736f0a22a091a702e23ef7cf58e56cfa9 --- M src/gb/common_vty.c M src/gb/gprs_bssgp_vty.c M src/gb/gprs_ns2_vty.c M src/gb/gprs_ns_vty.c 4 files changed, 29 insertions(+), 29 deletions(-)
Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified
diff --git a/src/gb/common_vty.c b/src/gb/common_vty.c index ad3dea2..da88475 100644 --- a/src/gb/common_vty.c +++ b/src/gb/common_vty.c @@ -40,23 +40,23 @@ int gprs_log_filter_fn(const struct log_context *ctx, struct log_target *tar) { - const void *nse = ctx->ctx[LOG_CTX_GB_NSE]; - const void *nsvc = ctx->ctx[LOG_CTX_GB_NSVC]; - const void *bvc = ctx->ctx[LOG_CTX_GB_BVC]; + const void *nse = log_get_context(ctx, LOG_CTX_GB_NSE); + const void *nsvc = log_get_context(ctx, LOG_CTX_GB_NSVC); + const void *bvc = log_get_context(ctx, LOG_CTX_GB_BVC);
/* Filter on the NS Entity */ - if ((tar->filter_map & (1 << LOG_FLT_GB_NSE)) != 0 - && nse && (nse == tar->filter_data[LOG_FLT_GB_NSE])) + if (log_get_filter(tar, LOG_FLT_GB_NSE) && + nse && (nse == log_get_filter_data(tar, LOG_FLT_GB_NSE))) return 1;
/* Filter on the NS Virtual Connection */ - if ((tar->filter_map & (1 << LOG_FLT_GB_NSVC)) != 0 - && nsvc && (nsvc == tar->filter_data[LOG_FLT_GB_NSVC])) + if (log_get_filter(tar, LOG_FLT_GB_NSVC) && + nsvc && (nsvc == log_get_filter_data(tar, LOG_FLT_GB_NSVC))) return 1;
/* Filter on the BSSGP Virtual Connection */ - if ((tar->filter_map & (1 << LOG_FLT_GB_BVC)) != 0 - && bvc && (bvc == tar->filter_data[LOG_FLT_GB_BVC])) + if (log_get_filter(tar, LOG_FLT_GB_BVC) && + bvc && (bvc == log_get_filter_data(tar, LOG_FLT_GB_BVC))) return 1;
return 0; diff --git a/src/gb/gprs_bssgp_vty.c b/src/gb/gprs_bssgp_vty.c index d04641d..ed4cdb9 100644 --- a/src/gb/gprs_bssgp_vty.c +++ b/src/gb/gprs_bssgp_vty.c @@ -48,11 +48,11 @@ struct bssgp_bvc_ctx *bctx) { if (bctx) { - target->filter_map |= (1 << LOG_FLT_GB_BVC); - target->filter_data[LOG_FLT_GB_BVC] = bctx; - } 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; + log_set_filter(target, LOG_FLT_GB_BVC, true); + log_set_filter_data(target, LOG_FLT_GB_BVC, bctx); + } else if (log_get_filter(target, LOG_FLT_GB_BVC)) { + log_set_filter(target, LOG_FLT_GB_BVC, false); + log_set_filter_data(target, LOG_FLT_GB_BVC, NULL); } }
diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 32de49d..c85180e 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -2180,11 +2180,11 @@ struct gprs_ns2_nse *nse) { if (nse) { - target->filter_map |= (1 << LOG_FLT_GB_NSE); - target->filter_data[LOG_FLT_GB_NSE] = nse; - } else if (target->filter_data[LOG_FLT_GB_NSE]) { - target->filter_map = ~(1 << LOG_FLT_GB_NSE); - target->filter_data[LOG_FLT_GB_NSE] = NULL; + log_set_filter(target, LOG_FLT_GB_NSE, true); + log_set_filter_data(target, LOG_FLT_GB_NSE, nse); + } else if (log_get_filter(target, LOG_FLT_GB_NSE)) { + log_set_filter(target, LOG_FLT_GB_NSE, false); + log_set_filter_data(target, LOG_FLT_GB_NSE, NULL); } }
@@ -2192,11 +2192,11 @@ struct gprs_ns2_vc *nsvc) { if (nsvc) { - target->filter_map |= (1 << LOG_FLT_GB_NSVC); - target->filter_data[LOG_FLT_GB_NSVC] = nsvc; - } else if (target->filter_data[LOG_FLT_GB_NSVC]) { - target->filter_map = ~(1 << LOG_FLT_GB_NSVC); - target->filter_data[LOG_FLT_GB_NSVC] = NULL; + log_set_filter(target, LOG_FLT_GB_NSVC, true); + log_set_filter_data(target, LOG_FLT_GB_NSVC, nsvc); + } else if (log_get_filter(target, LOG_FLT_GB_NSVC)) { + log_set_filter(target, LOG_FLT_GB_NSVC, false); + log_set_filter_data(target, LOG_FLT_GB_NSVC, NULL); } }
diff --git a/src/gb/gprs_ns_vty.c b/src/gb/gprs_ns_vty.c index f27bf6a..6bfdc3a 100644 --- a/src/gb/gprs_ns_vty.c +++ b/src/gb/gprs_ns_vty.c @@ -68,11 +68,11 @@ struct gprs_nsvc *nsvc) { if (nsvc) { - target->filter_map |= (1 << LOG_FLT_GB_NSVC); - target->filter_data[LOG_FLT_GB_NSVC] = nsvc; - } else if (target->filter_data[LOG_FLT_GB_NSVC]) { - target->filter_map = ~(1 << LOG_FLT_GB_NSVC); - target->filter_data[LOG_FLT_GB_NSVC] = NULL; + log_set_filter(target, LOG_FLT_GB_NSVC, true); + log_set_filter_data(target, LOG_FLT_GB_NSVC, nsvc); + } else if (log_get_filter(target, LOG_FLT_GB_NSVC)) { + log_set_filter(target, LOG_FLT_GB_NSVC, false); + log_set_filter_data(target, LOG_FLT_GB_NSVC, NULL); } }