diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2014-12-03 09:28:24 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-12-05 14:59:02 +0100 |
| commit | 1e30a28e51b5e8a14b977233858f267f839197d5 (patch) | |
| tree | 07f0a3f2fc5cf316b40d55cae5f40243b419e5ca /openbsc/include/openbsc/gsm_subscriber.h | |
| parent | dae1f64ba688eaa24aad6ce15a8529bdef788146 (diff) | |
msc: Add and use gsm_subscriber_group
Currently every subcriber object directly refers to the gsm_network
which contains a flag shared by every related subscriber
(keep_subscr). This adds a dependency on gsm_network even if only the
function defined in gsm_subscriber_base.c are used.
This patch adds a new struct gsm_subscriber_group which contains the
keep_subscr flag and a back reference to the network object. The
latter is not dereferenced in gsm_subscriber_base.c, so it can safely
be set to NULL when only that part of the gsm_subscriber API is being
used. It also changes that API to use gsm_subscriber_group instead of
gsm_network parameters.
Since there are some places where a pointer to the gsm_network is
needed but where only a gsm_subscriber is available, a 'net' back
pointer is added to the group struct, too. Nevertheless subscr group
and network could be separated completely, but this is not the topic
of this commit.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'openbsc/include/openbsc/gsm_subscriber.h')
| -rw-r--r-- | openbsc/include/openbsc/gsm_subscriber.h | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index 7e0a419ae..eaf4028da 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -20,6 +20,12 @@ struct vty; struct sgsn_mm_ctx; +struct gsm_subscriber_group { + struct gsm_network *net; + + int keep_subscr; +}; + struct gsm_equipment { long long unsigned int id; char imei[GSM_IMEI_LENGTH]; @@ -33,7 +39,7 @@ struct gsm_equipment { }; struct gsm_subscriber { - struct gsm_network *net; + struct gsm_subscriber_group *group; long long unsigned int id; char imsi[GSM_IMSI_LENGTH]; uint32_t tmsi; @@ -77,25 +83,25 @@ enum gsm_subscriber_update_reason { struct gsm_subscriber *subscr_get(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_put(struct gsm_subscriber *subscr); -struct gsm_subscriber *subscr_create_subscriber(struct gsm_network *net, +struct gsm_subscriber *subscr_create_subscriber(struct gsm_subscriber_group *sgrp, const char *imsi); -struct gsm_subscriber *subscr_get_by_tmsi(struct gsm_network *net, +struct gsm_subscriber *subscr_get_by_tmsi(struct gsm_subscriber_group *sgrp, uint32_t tmsi); -struct gsm_subscriber *subscr_get_by_imsi(struct gsm_network *net, +struct gsm_subscriber *subscr_get_by_imsi(struct gsm_subscriber_group *sgrp, const char *imsi); -struct gsm_subscriber *subscr_get_by_extension(struct gsm_network *net, +struct gsm_subscriber *subscr_get_by_extension(struct gsm_subscriber_group *sgrp, const char *ext); -struct gsm_subscriber *subscr_get_by_id(struct gsm_network *net, +struct gsm_subscriber *subscr_get_by_id(struct gsm_subscriber_group *sgrp, unsigned long long id); -struct gsm_subscriber *subscr_get_or_create(struct gsm_network *net, +struct gsm_subscriber *subscr_get_or_create(struct gsm_subscriber_group *sgrp, const char *imsi); int subscr_update(struct gsm_subscriber *s, struct gsm_bts *bts, int reason); void subscr_put_channel(struct gsm_subscriber *subscr); void subscr_get_channel(struct gsm_subscriber *subscr, int type, gsm_cbfn *cbfn, void *param); -struct gsm_subscriber *subscr_active_by_tmsi(struct gsm_network *net, +struct gsm_subscriber *subscr_active_by_tmsi(struct gsm_subscriber_group *sgrp, uint32_t tmsi); -struct gsm_subscriber *subscr_active_by_imsi(struct gsm_network *net, +struct gsm_subscriber *subscr_active_by_imsi(struct gsm_subscriber_group *sgrp, const char *imsi); int subscr_pending_requests(struct gsm_subscriber *subscr); @@ -105,9 +111,9 @@ int subscr_pending_kick(struct gsm_subscriber *subscr); char *subscr_name(struct gsm_subscriber *subscr); -int subscr_purge_inactive(struct gsm_network *net); +int subscr_purge_inactive(struct gsm_subscriber_group *sgrp); void subscr_update_from_db(struct gsm_subscriber *subscr); -void subscr_expire(struct gsm_network *net); +void subscr_expire(struct gsm_subscriber_group *sgrp); int subscr_update_expire_lu(struct gsm_subscriber *subscr, struct gsm_bts *bts); /* internal */ |