From 812ba6dc63a75c39678dd3fe652768e76bf63183 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 17 Feb 2017 16:35:27 +0100 Subject: logging: centrally define ctx and filter indexes It is too easy for calling code to use the same filter and context indexes for different filters and structs. For example, openbsc's IMSI filter and libgb's GPRS_BVC filter both fall on index 1 even though there are plenty more indexes to choose from. To alleviate this, have one central definition here, sort of like ports.h does for VTY and CTRL port numbers. Add static asserts to make sure the indexes fit in the available array and bit mask space. Calling code like openbsc.git and osmo-pcu need adjustments and/or should move to using these enum values instead of their local definitions. Taking this opportunity to also prepare for a split of struct gsm_subscriber in openbsc into bsc_subsciber and vlr_subscriber with appropriate separate filter index constants for both subscriber types. Include previous LOG_FILTER_ALL in the LOGGING_FILTER_* enum, and replace its use by (1 << LOGGING_FILTER_ALL). Change-Id: I5c343630020f4b108099696fd96c2111614c8067 --- include/osmocom/gprs/gprs_msgb.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/osmocom/gprs/gprs_msgb.h') diff --git a/include/osmocom/gprs/gprs_msgb.h b/include/osmocom/gprs/gprs_msgb.h index 06f5cca2..9ccc9a55 100644 --- a/include/osmocom/gprs/gprs_msgb.h +++ b/include/osmocom/gprs/gprs_msgb.h @@ -26,10 +26,6 @@ struct libgb_msgb_cb { #define msgb_bcid(__x) LIBGB_MSGB_CB(__x)->bssgp_cell_id #define msgb_llch(__x) LIBGB_MSGB_CB(__x)->llch -/* logging contexts */ -#define GPRS_CTX_NSVC 0 -#define GPRS_CTX_BVC 1 - #include int gprs_log_filter_fn(const struct log_context *ctx, struct log_target *tar); -- cgit v1.2.3