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/src/osmo-bsc | |
| 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/src/osmo-bsc')
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_bssap.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_filter.c | 5 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_grace.c | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c index dda31578e..a801e0e69 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c @@ -167,7 +167,7 @@ static int bssmap_handle_paging(struct osmo_msc_data *msc, LOGP(DMSC, LOGL_ERROR, "eMLPP is not handled\n"); } - subscr = subscr_get_or_create(msc->network, mi_string); + subscr = subscr_get_or_create(msc->network->subscr_group, mi_string); if (!subscr) { LOGP(DMSC, LOGL_ERROR, "Failed to allocate a subscriber for %s\n", mi_string); return -1; diff --git a/openbsc/src/osmo-bsc/osmo_bsc_filter.c b/openbsc/src/osmo-bsc/osmo_bsc_filter.c index 608f52552..596bfbdc1 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_filter.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_filter.c @@ -78,11 +78,12 @@ static struct gsm_subscriber *extract_sub(struct gsm_subscriber_connection *conn switch (mi_type) { case GSM_MI_TYPE_TMSI: - subscr = subscr_active_by_tmsi(conn->bts->network, + subscr = subscr_active_by_tmsi(conn->bts->network->subscr_group, tmsi_from_string(mi_string)); break; case GSM_MI_TYPE_IMSI: - subscr = subscr_active_by_imsi(conn->bts->network, mi_string); + subscr = subscr_active_by_imsi(conn->bts->network->subscr_group, + mi_string); break; default: subscr = NULL; diff --git a/openbsc/src/osmo-bsc/osmo_bsc_grace.c b/openbsc/src/osmo-bsc/osmo_bsc_grace.c index 4e1c79ebd..aa268a40a 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_grace.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_grace.c @@ -41,7 +41,7 @@ int bsc_grace_paging_request(struct gsm_subscriber *subscr, int chan_needed, { struct gsm_bts *bts = NULL; - if (subscr->net->bsc_data->rf_ctrl->policy == S_RF_ON) + if (subscr->group->net->bsc_data->rf_ctrl->policy == S_RF_ON) goto page; /* @@ -49,7 +49,7 @@ int bsc_grace_paging_request(struct gsm_subscriber *subscr, int chan_needed, * with NULL and iterate through all bts. */ do { - bts = gsm_bts_by_lac(subscr->net, subscr->lac, bts); + bts = gsm_bts_by_lac(subscr->group->net, subscr->lac, bts); if (!bts) break; @@ -68,7 +68,8 @@ int bsc_grace_paging_request(struct gsm_subscriber *subscr, int chan_needed, /* All bts are either off or in the grace period */ return 0; page: - return paging_request(subscr->net, subscr, chan_needed, NULL, msc); + return paging_request(subscr->group->net, subscr, chan_needed, NULL, + msc); } static int handle_sub(struct gsm_lchan *lchan, const char *text) |