diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-22 16:03:49 +0100 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-22 17:06:28 +0100 |
commit | 7a2f58ea63a777dcda1dd8ff1e7c2459ba2758c6 (patch) | |
tree | 8313887764e268b6851c4e2d5a64d089a16e6a40 /src | |
parent | c01e90933fef6449f64db65a63590a6507bae34a (diff) |
dissolve libcommon: drop gsm_subscriber_base.c, move vlr_subscr_* to vlr.c
Change-Id: Ia69890da68b8afa8a2a4e8ab58ec5c4a4ba9d06a
Diffstat (limited to 'src')
-rw-r--r-- | src/libcommon/Makefile.am | 1 | ||||
-rw-r--r-- | src/libcommon/gsm_subscriber_base.c | 65 | ||||
-rw-r--r-- | src/libvlr/vlr.c | 27 |
3 files changed, 27 insertions, 66 deletions
diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am index dff0be35d..d5ac73d13 100644 --- a/src/libcommon/Makefile.am +++ b/src/libcommon/Makefile.am @@ -23,7 +23,6 @@ libcommon_a_SOURCES = \ gsm_data.c \ gsup_client.c \ oap_client.c \ - gsm_subscriber_base.c \ $(NULL) noinst_PROGRAMS = \ diff --git a/src/libcommon/gsm_subscriber_base.c b/src/libcommon/gsm_subscriber_base.c deleted file mode 100644 index 20147a3c3..000000000 --- a/src/libcommon/gsm_subscriber_base.c +++ /dev/null @@ -1,65 +0,0 @@ -/* The concept of a subscriber as seen by the BSC */ - -/* (C) 2008 by Harald Welte <laforge@gnumonks.org> - * (C) 2009-2010 by Holger Hans Peter Freyther <zecke@selfish.org> - * (C) 2010 by On-Waves - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <assert.h> - -#include <osmocom/core/talloc.h> -#include <osmocom/core/utils.h> -#include <osmocom/gsm/gsm48.h> -#include <osmocom/msc/gsm_subscriber.h> -#include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> - -LLIST_HEAD(active_subscribers); -void *tall_subscr_ctx; - -/* return static buffer with printable name of VLR subscriber */ -const char *vlr_subscr_name(struct vlr_subscr *vsub) -{ - static char buf[32]; - if (!vsub) - return "unknown"; - if (vsub->msisdn[0]) - snprintf(buf, sizeof(buf), "MSISDN:%s", vsub->msisdn); - else if (vsub->imsi[0]) - snprintf(buf, sizeof(buf), "IMSI:%s", vsub->imsi); - else if (vsub->tmsi != GSM_RESERVED_TMSI) - snprintf(buf, sizeof(buf), "TMSI:0x%08x", vsub->tmsi); - else if (vsub->tmsi_new != GSM_RESERVED_TMSI) - snprintf(buf, sizeof(buf), "TMSI(new):0x%08x", vsub->tmsi_new); - else - return "unknown"; - buf[sizeof(buf)-1] = '\0'; - return buf; -} - -const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub) -{ - if (!vsub || !vsub->msisdn[0]) - return vlr_subscr_name(vsub); - return vsub->msisdn; -} diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 01e7ee104..3e14593ad 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -76,6 +76,33 @@ uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer) return vlr->cfg.timer[tidx]; } +/* return static buffer with printable name of VLR subscriber */ +const char *vlr_subscr_name(struct vlr_subscr *vsub) +{ + static char buf[32]; + if (!vsub) + return "unknown"; + if (vsub->msisdn[0]) + snprintf(buf, sizeof(buf), "MSISDN:%s", vsub->msisdn); + else if (vsub->imsi[0]) + snprintf(buf, sizeof(buf), "IMSI:%s", vsub->imsi); + else if (vsub->tmsi != GSM_RESERVED_TMSI) + snprintf(buf, sizeof(buf), "TMSI:0x%08x", vsub->tmsi); + else if (vsub->tmsi_new != GSM_RESERVED_TMSI) + snprintf(buf, sizeof(buf), "TMSI(new):0x%08x", vsub->tmsi_new); + else + return "unknown"; + buf[sizeof(buf)-1] = '\0'; + return buf; +} + +const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub) +{ + if (!vsub || !vsub->msisdn[0]) + return vlr_subscr_name(vsub); + return vsub->msisdn; +} + struct vlr_subscr *_vlr_subscr_find_by_imsi(struct vlr_instance *vlr, const char *imsi, const char *file, int line) |