cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

bsc_subscr_name: print both IMSI and TMSI 

Always use a format containing only osmo_identifier_valid() characters.

Change-Id: I6cdbaad2f0d0552f697440bf9a75bef36d59a597
This commit is contained in:
Neels Hofmeyr 2020-09-25 00:48:24 +00:00
parent 86a1dca5c7
commit 7d9b9437f8
3 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/osmo-bsc/bsc_subscriber.c
View File

@ -51,7 +51,7 @@ static int bsub_use_cb(struct osmo_use_count_entry *e, int32_t old_use_count, co
else
level = LOGL_DEBUG;
LOGPSRC(DREF, level, file, line, "BSC subscr %s: %s %s: now used by %s\n",
LOGPSRC(DREF, level, file, line, "%s: %s %s: now used by %s\n",
bsc_subscr_name(bsub),
(e->count - old_use_count) > 0? "+" : "-", e->use,
osmo_use_count_to_str_c(OTC_SELECT, &bsub->use_count));
@ -188,30 +188,36 @@ struct bsc_subscr *bsc_subscr_find_or_create_by_mi(struct llist_head *list, cons
}
}
static int bsc_subscr_name_buf(char *buf, size_t buflen, struct bsc_subscr *bsub)
{
struct osmo_strbuf sb = { .buf = buf, .len = buflen };
OSMO_STRBUF_PRINTF(sb, "subscr");
if (!bsub) {
OSMO_STRBUF_PRINTF(sb, "-null");
return sb.chars_needed;
}
if (bsub->imsi[0])
OSMO_STRBUF_PRINTF(sb, "-IMSI-%s", bsub->imsi);
if (bsub->tmsi != GSM_RESERVED_TMSI)
OSMO_STRBUF_PRINTF(sb, "-TMSI-0x%08x", bsub->tmsi);
return sb.chars_needed;
}
static char *bsc_subscr_name_c(void *ctx, struct bsc_subscr *bsub)
{
OSMO_NAME_C_IMPL(ctx, 64, "ERROR", bsc_subscr_name_buf, bsub)
}
const char *bsc_subscr_name(struct bsc_subscr *bsub)
{
static char buf[32];
if (!bsub)
return "unknown";
if (bsub->imsi[0])
snprintf(buf, sizeof(buf), "IMSI:%s", bsub->imsi);
else
snprintf(buf, sizeof(buf), "TMSI:0x%08x", bsub->tmsi);
return buf;
return bsc_subscr_name_c(OTC_SELECT, bsub);
}
/* Like bsc_subscr_name() but returns only characters approved by osmo_identifier_valid(), useful for
* osmo_fsm_inst IDs. */
const char *bsc_subscr_id(struct bsc_subscr *bsub)
{
static char buf[32];
if (!bsub)
return "unknown";
if (bsub->imsi[0])
snprintf(buf, sizeof(buf), "IMSI%s", bsub->imsi);
else
snprintf(buf, sizeof(buf), "TMSI%08x", bsub->tmsi);
return buf;
return bsc_subscr_name(bsub);
}
static void bsc_subscr_free(struct bsc_subscr *bsub)

1
tests/subscr/bsc_subscr_test.c
View File

@ -75,6 +75,7 @@ static void test_bsc_subscr(void)
/* Allocate entry 2 */
s2 = bsc_subscr_find_or_create_by_imsi(bsc_subscribers, imsi2, BSUB_USE);
s2->tmsi = 0x73517351;
VERBOSE_ASSERT(llist_count(bsc_subscribers), == 2, "%d");
/* Allocate entry 3 */

40
tests/subscr/bsc_subscr_test.err
View File

@ -1,20 +1,20 @@
DREF BSC subscr IMSI:1234567890: + test: now used by 1 (test)
DREF BSC subscr IMSI:1234567890: + test: now used by 2 (2*test)
DREF BSC subscr IMSI:1234567890: - test: now used by 1 (test)
DREF BSC subscr IMSI:9876543210: + test: now used by 1 (test)
DREF BSC subscr IMSI:5656565656: + test: now used by 1 (test)
DREF BSC subscr IMSI:1234567890: + test: now used by 2 (2*test)
DREF BSC subscr IMSI:1234567890: - test: now used by 1 (test)
DREF BSC subscr IMSI:9876543210: + test: now used by 2 (2*test)
DREF BSC subscr IMSI:9876543210: - test: now used by 1 (test)
DREF BSC subscr IMSI:5656565656: + test: now used by 2 (2*test)
DREF BSC subscr IMSI:5656565656: - test: now used by 1 (test)
DREF BSC subscr IMSI:1234567890: - test: now used by 0 (-)
DREF BSC subscr IMSI:9876543210: + test: now used by 2 (2*test)
DREF BSC subscr IMSI:9876543210: - test: now used by 1 (test)
DREF BSC subscr IMSI:5656565656: + test: now used by 2 (2*test)
DREF BSC subscr IMSI:5656565656: - test: now used by 1 (test)
DREF BSC subscr IMSI:9876543210: - test: now used by 0 (-)
DREF BSC subscr IMSI:5656565656: + test: now used by 2 (2*test)
DREF BSC subscr IMSI:5656565656: - test: now used by 1 (test)
DREF BSC subscr IMSI:5656565656: - test: now used by 0 (-)
DREF subscr-IMSI-1234567890: + test: now used by 1 (test)
DREF subscr-IMSI-1234567890: + test: now used by 2 (2*test)
DREF subscr-IMSI-1234567890: - test: now used by 1 (test)
DREF subscr-IMSI-9876543210: + test: now used by 1 (test)
DREF subscr-IMSI-5656565656: + test: now used by 1 (test)
DREF subscr-IMSI-1234567890: + test: now used by 2 (2*test)
DREF subscr-IMSI-1234567890: - test: now used by 1 (test)
DREF subscr-IMSI-9876543210-TMSI-0x73517351: + test: now used by 2 (2*test)
DREF subscr-IMSI-9876543210-TMSI-0x73517351: - test: now used by 1 (test)
DREF subscr-IMSI-5656565656: + test: now used by 2 (2*test)
DREF subscr-IMSI-5656565656: - test: now used by 1 (test)
DREF subscr-IMSI-1234567890: - test: now used by 0 (-)
DREF subscr-IMSI-9876543210-TMSI-0x73517351: + test: now used by 2 (2*test)
DREF subscr-IMSI-9876543210-TMSI-0x73517351: - test: now used by 1 (test)
DREF subscr-IMSI-5656565656: + test: now used by 2 (2*test)
DREF subscr-IMSI-5656565656: - test: now used by 1 (test)
DREF subscr-IMSI-9876543210-TMSI-0x73517351: - test: now used by 0 (-)
DREF subscr-IMSI-5656565656: + test: now used by 2 (2*test)
DREF subscr-IMSI-5656565656: - test: now used by 1 (test)
DREF subscr-IMSI-5656565656: - test: now used by 0 (-)