diff options
Diffstat (limited to 'include/osmocom/bsc/bsc_subscriber.h')
| -rw-r--r-- | include/osmocom/bsc/bsc_subscriber.h | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index a602a9ef6..6fffafdb3 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -5,6 +5,7 @@ #include <stdint.h> #include <osmocom/core/linuxlist.h> +#include <osmocom/core/use_count.h> #include <osmocom/gsm/protocol/gsm_23_003.h> #include <osmocom/gsm/gsm48.h> @@ -12,7 +13,7 @@ struct log_target; struct bsc_subscr { struct llist_head entry; - int use_count; + struct osmo_use_count use_count; char imsi[GSM23003_IMSI_MAX_DIGITS+1]; uint32_t tmsi; @@ -22,25 +23,29 @@ const char *bsc_subscr_name(struct bsc_subscr *bsub); const char *bsc_subscr_id(struct bsc_subscr *bsub); struct bsc_subscr *bsc_subscr_find_or_create_by_imsi(struct llist_head *list, - const char *imsi); + const char *imsi, + const char *use_token); struct bsc_subscr *bsc_subscr_find_or_create_by_tmsi(struct llist_head *list, - uint32_t tmsi); -struct bsc_subscr *bsc_subscr_find_or_create_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi); + uint32_t tmsi, + const char *use_token); +struct bsc_subscr *bsc_subscr_find_or_create_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi, + const char *use_token); struct bsc_subscr *bsc_subscr_find_by_imsi(struct llist_head *list, - const char *imsi); + const char *imsi, + const char *use_token); struct bsc_subscr *bsc_subscr_find_by_tmsi(struct llist_head *list, - uint32_t tmsi); -struct bsc_subscr *bsc_subscr_find_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi); + uint32_t tmsi, + const char *use_token); +struct bsc_subscr *bsc_subscr_find_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi, + const char *use_token); void bsc_subscr_set_imsi(struct bsc_subscr *bsub, const char *imsi); -struct bsc_subscr *_bsc_subscr_get(struct bsc_subscr *bsub, - const char *file, int line); -struct bsc_subscr *_bsc_subscr_put(struct bsc_subscr *bsub, - const char *file, int line); -#define bsc_subscr_get(bsub) _bsc_subscr_get(bsub, __FILE__, __LINE__) -#define bsc_subscr_put(bsub) _bsc_subscr_put(bsub, __FILE__, __LINE__) +#define bsc_subscr_get(bsc_subscr, use) \ + OSMO_ASSERT(osmo_use_count_get_put(&(bsc_subscr)->use_count, use, 1) == 0) +#define bsc_subscr_put(bsc_subscr, use) \ + OSMO_ASSERT(osmo_use_count_get_put(&(bsc_subscr)->use_count, use, -1) == 0) void log_set_filter_bsc_subscr(struct log_target *target, struct bsc_subscr *bsub); |