subscr: Make db_create_subscriber fail on duplicates
The issue of db_create_subscriber updating an already existing subscr is that the same subscriber will then have two entries in the active subscribers list. In general this will break assumptions that a subscr can be compared by comparing the pointer. In the case of the VTY this was not an issue as the created subscr was immediately destroyed again but it is better to avoid this problem. Change the VTY command to find the subscriber and then call sync to have the updated time set. The side-effect is we will now have two queries for the subscriber. Once through subscr_get_by_imsi and once through db_create_subscriber. Change the db_create_subscriber to fail if a subscriber already exists, and add a testcase for this behavior and do not updated the 'updated' timestamp of an already existing subscriber. Add a testcase for this behavior. Related: OS Issue #1657
This commit is contained in:
parent
de392254ff
commit
2826df56b2
|
@ -508,14 +508,8 @@ struct gsm_subscriber *db_create_subscriber(const char *imsi)
|
|||
/* Is this subscriber known in the db? */
|
||||
subscr = db_get_subscriber(GSM_SUBSCRIBER_IMSI, imsi);
|
||||
if (subscr) {
|
||||
result = dbi_conn_queryf(conn,
|
||||
"UPDATE Subscriber set updated = datetime('now') "
|
||||
"WHERE imsi = %s " , imsi);
|
||||
if (!result)
|
||||
LOGP(DDB, LOGL_ERROR, "failed to update timestamp\n");
|
||||
else
|
||||
dbi_result_free(result);
|
||||
return subscr;
|
||||
subscr_put(subscr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
subscr = subscr_alloc();
|
||||
|
|
|
@ -236,12 +236,18 @@ DEFUN(subscriber_create,
|
|||
struct gsm_network *gsmnet = gsmnet_from_vty(vty);
|
||||
struct gsm_subscriber *subscr;
|
||||
|
||||
subscr = subscr_get_by_imsi(gsmnet->subscr_group, argv[0]);
|
||||
if (subscr)
|
||||
db_sync_subscriber(subscr);
|
||||
else {
|
||||
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);
|
||||
return CMD_WARNING;
|
||||
}
|
||||
}
|
||||
|
||||
/* Show info about the created subscriber. */
|
||||
subscr_dump_full_vty(vty, subscr);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* (C) 2008 by Jan Luebbe <jluebbe@debian.org>
|
||||
* (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org>
|
||||
* (C) 2009-2016 by Holger Hans Peter Freyther <zecke@selfish.org>
|
||||
* (C) 2014 by Alexander Chemeris <Alexander.Chemeris@fairwaves.co>
|
||||
* All Rights Reserved
|
||||
*
|
||||
|
@ -246,6 +246,10 @@ int main()
|
|||
SUBSCR_PUT(alice_db);
|
||||
SUBSCR_PUT(alice);
|
||||
|
||||
/* create it again and see it fails */
|
||||
alice = db_create_subscriber(alice_imsi);
|
||||
OSMO_ASSERT(!alice);
|
||||
|
||||
test_sms();
|
||||
test_sms_migrate();
|
||||
|
||||
|
|
Loading…
Reference in New Issue