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/libmsc/vty_interface_layer3.c | |
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/libmsc/vty_interface_layer3.c')
-rw-r--r-- | openbsc/src/libmsc/vty_interface_layer3.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index 8890099c6..f9213f542 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -169,7 +169,7 @@ static int _send_sms_str(struct gsm_subscriber *receiver, } sms_free(sms); - sms_queue_trigger(receiver->net->sms_queue); + sms_queue_trigger(receiver->group->net->sms_queue); return CMD_SUCCESS; } @@ -178,13 +178,13 @@ static struct gsm_subscriber *get_subscr_by_argv(struct gsm_network *gsmnet, const char *id) { if (!strcmp(type, "extension")) - return subscr_get_by_extension(gsmnet, id); + return subscr_get_by_extension(gsmnet->subscr_group, id); else if (!strcmp(type, "imsi")) - return subscr_get_by_imsi(gsmnet, id); + return subscr_get_by_imsi(gsmnet->subscr_group, id); else if (!strcmp(type, "tmsi")) - return subscr_get_by_tmsi(gsmnet, atoi(id)); + return subscr_get_by_tmsi(gsmnet->subscr_group, atoi(id)); else if (!strcmp(type, "id")) - return subscr_get_by_id(gsmnet, atoi(id)); + return subscr_get_by_id(gsmnet->subscr_group, atoi(id)); return NULL; } @@ -229,7 +229,7 @@ DEFUN(subscriber_create, struct gsm_network *gsmnet = gsmnet_from_vty(vty); struct gsm_subscriber *subscr; - subscr = subscr_create_subscriber(gsmnet, argv[0]); + subscr = subscr_create_subscriber(gsmnet->subscr_group, argv[0]); if (!subscr) { vty_out(vty, "%% No subscriber created for IMSI %s%s", argv[0], VTY_NEWLINE); @@ -779,7 +779,7 @@ DEFUN(subscriber_purge, struct gsm_network *net = gsmnet_from_vty(vty); int purged; - purged = subscr_purge_inactive(net); + purged = subscr_purge_inactive(net->subscr_group); vty_out(vty, "%d subscriber(s) were purged.%s", purged, VTY_NEWLINE); return CMD_SUCCESS; } |