add column 'last_lu_rat', show last RAN type
Change-Id: I5d73b1d928b61175d3198326706b7f49ba50e16f
This commit is contained in:
Neels Hofmeyr
parent
2fb33f1c57
commit
0f9daa66a1
|
|
@ -40,7 +40,12 @@ CREATE TABLE subscriber (
|
|||
|
||||
-- Timestamp of last location update seen from subscriber
|
||||
-- The value is a string which encodes a UTC timestamp in granularity of seconds.
|
||||
last_lu_seen TIMESTAMP default NULL
|
||||
last_lu_seen TIMESTAMP default NULL,
|
||||
|
||||
-- Last Radio Access Type list as sent during Location Updating Request.
|
||||
-- This is usually just one RAT name, but can be a comma separated list of strings
|
||||
-- of all the RAT types sent during Location Updating Request.
|
||||
last_lu_rat TEXT default NULL
|
||||
);
|
||||
|
||||
CREATE TABLE subscriber_apn (
|
||||
|
|
@ -83,4 +88,4 @@ CREATE UNIQUE INDEX idx_subscr_rat_flag ON subscriber_rat (subscriber_id, rat);
|
|||
|
||||
-- Set HLR database schema version number
|
||||
-- Note: This constant is currently duplicated in src/db.c and must be kept in sync!
|
||||
PRAGMA user_version = 2;
|
||||
PRAGMA user_version = 3;
|
||||
|
|
|
|||
51
src/db.c
51
src/db.c
|
|
@ -28,7 +28,7 @@
|
|||
#include "db_bootstrap.h"
|
||||
|
||||
/* This constant is currently duplicated in sql/hlr.sql and must be kept in sync! */
|
||||
#define CURRENT_SCHEMA_VERSION 2
|
||||
#define CURRENT_SCHEMA_VERSION 3
|
||||
|
||||
#define SEL_COLUMNS \
|
||||
"id," \
|
||||
|
|
@ -44,7 +44,8 @@
|
|||
"lmsi," \
|
||||
"ms_purged_cs," \
|
||||
"ms_purged_ps," \
|
||||
"last_lu_seen"
|
||||
"last_lu_seen," \
|
||||
"last_lu_rat"
|
||||
|
||||
static const char *stmt_sql[] = {
|
||||
[DB_STMT_SEL_BY_IMSI] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE imsi = ?",
|
||||
|
|
@ -75,7 +76,8 @@ static const char *stmt_sql[] = {
|
|||
"INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, op, opc, ind_bitlen)"
|
||||
" VALUES($subscriber_id, $algo_id_3g, $k, $op, $opc, $ind_bitlen)",
|
||||
[DB_STMT_AUC_3G_DELETE] = "DELETE FROM auc_3g WHERE subscriber_id = $subscriber_id",
|
||||
[DB_STMT_SET_LAST_LU_SEEN] = "UPDATE subscriber SET last_lu_seen = datetime($val, 'unixepoch') WHERE id = $subscriber_id",
|
||||
[DB_STMT_SET_LAST_LU_SEEN] = "UPDATE subscriber SET last_lu_seen = datetime($val, 'unixepoch'), last_lu_rat = $rat"
|
||||
" WHERE id = $subscriber_id",
|
||||
[DB_STMT_UPD_RAT_FLAG] = "INSERT OR REPLACE INTO subscriber_rat (subscriber_id, rat, allowed)"
|
||||
" VALUES ($subscriber_id, $rat, $allowed)",
|
||||
[DB_STMT_RAT_BY_ID] =
|
||||
|
|
@ -341,6 +343,40 @@ static int db_upgrade_v2(struct db_context *dbc)
|
|||
return SQLITE_DONE;
|
||||
}
|
||||
|
||||
static int db_upgrade_v3(struct db_context *dbc)
|
||||
{
|
||||
sqlite3_stmt *stmt;
|
||||
int rc;
|
||||
const char *update_stmt_sql = "ALTER TABLE subscriber ADD COLUMN last_lu_rat TEXT default NULL";
|
||||
const char *set_schema_version_sql = "PRAGMA user_version = 3";
|
||||
|
||||
rc = sqlite3_prepare_v2(dbc->db, update_stmt_sql, -1, &stmt, NULL);
|
||||
if (rc != SQLITE_OK) {
|
||||
LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", update_stmt_sql);
|
||||
return rc;
|
||||
}
|
||||
rc = sqlite3_step(stmt);
|
||||
db_remove_reset(stmt);
|
||||
sqlite3_finalize(stmt);
|
||||
if (rc != SQLITE_DONE) {
|
||||
LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1);
|
||||
return rc;
|
||||
}
|
||||
|
||||
rc = sqlite3_prepare_v2(dbc->db, set_schema_version_sql, -1, &stmt, NULL);
|
||||
if (rc != SQLITE_OK) {
|
||||
LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", set_schema_version_sql);
|
||||
return rc;
|
||||
}
|
||||
rc = sqlite3_step(stmt);
|
||||
if (rc != SQLITE_DONE)
|
||||
LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version 3\n");
|
||||
|
||||
db_remove_reset(stmt);
|
||||
sqlite3_finalize(stmt);
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int db_get_user_version(struct db_context *dbc)
|
||||
{
|
||||
const char *user_version_sql = "PRAGMA user_version";
|
||||
|
|
@ -462,6 +498,15 @@ struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logg
|
|||
}
|
||||
version = 2;
|
||||
/* fall through */
|
||||
case 2:
|
||||
rc = db_upgrade_v3(dbc);
|
||||
if (rc != SQLITE_DONE) {
|
||||
LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 3: (rc=%d) %s\n",
|
||||
rc, sqlite3_errmsg(dbc->db));
|
||||
goto out_free;
|
||||
}
|
||||
version = 2;
|
||||
/* fall through */
|
||||
/* case N: ... */
|
||||
default:
|
||||
break;
|
||||
|
|
|
|||
4
src/db.h
4
src/db.h
|
|
@ -89,6 +89,7 @@ struct hlr_subscriber {
|
|||
bool ms_purged_cs;
|
||||
bool ms_purged_ps;
|
||||
time_t last_lu_seen;
|
||||
char last_lu_rat[128];
|
||||
bool rat_types[OSMO_RAT_COUNT];
|
||||
};
|
||||
|
||||
|
|
@ -140,7 +141,8 @@ int db_subscr_get_by_id(struct db_context *dbc, int64_t id,
|
|||
struct hlr_subscriber *subscr);
|
||||
int db_subscr_nam(struct db_context *dbc, const char *imsi, bool nam_val, bool is_ps);
|
||||
int db_subscr_lu(struct db_context *dbc, int64_t subscr_id,
|
||||
const char *vlr_or_sgsn_number, bool is_ps);
|
||||
const char *vlr_or_sgsn_number, bool is_ps,
|
||||
const enum osmo_rat_type rat_types[], size_t rat_types_len);
|
||||
|
||||
int db_subscr_purge(struct db_context *dbc, const char *by_imsi,
|
||||
bool purge_val, bool is_ps);
|
||||
|
|
|
|||
21
src/db_hlr.c
21
src/db_hlr.c
|
|
@ -440,6 +440,7 @@ static int db_sel(struct db_context *dbc, sqlite3_stmt *stmt, struct hlr_subscri
|
|||
}
|
||||
}
|
||||
}
|
||||
copy_sqlite3_text_to_buf(subscr->last_lu_rat, stmt, 14);
|
||||
|
||||
out:
|
||||
db_remove_reset(stmt);
|
||||
|
|
@ -598,11 +599,14 @@ out:
|
|||
* -EIO on database errors.
|
||||
*/
|
||||
int db_subscr_lu(struct db_context *dbc, int64_t subscr_id,
|
||||
const char *vlr_or_sgsn_number, bool is_ps)
|
||||
const char *vlr_or_sgsn_number, bool is_ps,
|
||||
const enum osmo_rat_type rat_types[], size_t rat_types_len)
|
||||
{
|
||||
sqlite3_stmt *stmt;
|
||||
int rc, ret = 0;
|
||||
struct timespec localtime;
|
||||
char rat_types_str[128] = "";
|
||||
int i;
|
||||
|
||||
stmt = dbc->stmt[is_ps ? DB_STMT_UPD_SGSN_BY_ID
|
||||
: DB_STMT_UPD_VLR_BY_ID];
|
||||
|
|
@ -656,6 +660,21 @@ int db_subscr_lu(struct db_context *dbc, int64_t subscr_id,
|
|||
goto out;
|
||||
}
|
||||
|
||||
for (i = 0; i < rat_types_len; i++) {
|
||||
char *pos = rat_types_str + strnlen(rat_types_str, sizeof(rat_types_str));
|
||||
int len = pos - rat_types_str;
|
||||
rc = snprintf(pos, len, "%s%s", pos == rat_types_str ? "" : ",", osmo_rat_type_name(rat_types[i]));
|
||||
if (rc > len) {
|
||||
osmo_strlcpy(rat_types_str + sizeof(rat_types_str) - 4, "...", 4);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!db_bind_text(stmt, "$rat", rat_types_str)) {
|
||||
ret = -EIO;
|
||||
goto out;
|
||||
}
|
||||
|
||||
rc = sqlite3_step(stmt);
|
||||
if (rc != SQLITE_DONE) {
|
||||
LOGP(DAUC, LOGL_ERROR,
|
||||
|
|
|
|||
|
|
@ -356,7 +356,8 @@ static int rx_upd_loc_req(struct osmo_gsup_conn *conn,
|
|||
LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': storing %s = %s\n",
|
||||
subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number",
|
||||
osmo_quote_str((const char*)luop->peer, -1));
|
||||
if (db_subscr_lu(g_hlr->dbc, subscr->id, (const char *)luop->peer, luop->is_ps))
|
||||
if (db_subscr_lu(g_hlr->dbc, subscr->id, (const char *)luop->peer, luop->is_ps,
|
||||
gsup->rat_types, gsup->rat_types_len))
|
||||
LOGP(DAUC, LOGL_ERROR, "IMSI='%s': Cannot update %s in the database\n",
|
||||
subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number");
|
||||
|
||||
|
|
|
|||
|
|
@ -80,6 +80,8 @@ static void subscr_dump_full_vty(struct vty *vty, struct hlr_subscriber *subscr)
|
|||
vty_out(vty, " PS purged%s", VTY_NEWLINE);
|
||||
if (subscr->last_lu_seen)
|
||||
vty_out(vty, " last LU seen: %s%s", get_datestr(&subscr->last_lu_seen), VTY_NEWLINE);
|
||||
if (subscr->last_lu_rat[0])
|
||||
vty_out(vty, " last LU RAT: %s%s", subscr->last_lu_rat, VTY_NEWLINE);
|
||||
for (i = OSMO_RAT_UNKNOWN + 1; i < ARRAY_SIZE(subscr->rat_types); i++) {
|
||||
vty_out(vty, " %s: %s%s", osmo_rat_type_name(i), subscr->rat_types[i] ? "allowed" : "forbidden",
|
||||
VTY_NEWLINE);
|
||||
|
|
|
|||
|
|
@ -337,39 +337,39 @@ static void test_subscr_create_update_sel_delete()
|
|||
|
||||
comment("Record LU for PS and CS (SGSN and VLR names)");
|
||||
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "5952", true), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "5952", true, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "712", false), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "712", false, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
|
||||
comment("Record LU for PS and CS (SGSN and VLR names) *again*");
|
||||
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "111", true), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "111", true, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "111", true), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "111", true, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "222", false), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "222", false, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "222", false), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "222", false, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
|
||||
comment("Unset LU info for PS and CS (SGSN and VLR names)");
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "", true), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "", true, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "", false), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "", false, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "111", true), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "222", false), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "111", true, NULL, 0), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, "222", false, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, NULL, true), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, NULL, true, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, NULL, false), 0);
|
||||
ASSERT_RC(db_subscr_lu(dbc, id0, NULL, false, NULL, 0), 0);
|
||||
ASSERT_SEL(id, id0, 0);
|
||||
|
||||
comment("Record LU for non-existent ID");
|
||||
ASSERT_RC(db_subscr_lu(dbc, 99999, "5952", true), -ENOENT);
|
||||
ASSERT_RC(db_subscr_lu(dbc, 99999, "712", false), -ENOENT);
|
||||
ASSERT_RC(db_subscr_lu(dbc, 99999, "5952", true, NULL, 0), -ENOENT);
|
||||
ASSERT_RC(db_subscr_lu(dbc, 99999, "712", false, NULL, 0), -ENOENT);
|
||||
ASSERT_SEL(id, 99999, -ENOENT);
|
||||
|
||||
comment("Purge and un-purge PS and CS");
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ DAUC Cannot disable CS: no such subscriber: IMSI='foobar'
|
|||
|
||||
--- Record LU for PS and CS (SGSN and VLR names)
|
||||
|
||||
db_subscr_lu(dbc, id0, "5952", true) --> 0
|
||||
db_subscr_lu(dbc, id0, "5952", true, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -383,7 +383,7 @@ struct hlr_subscriber {
|
|||
.sgsn_number = '5952',
|
||||
}
|
||||
|
||||
db_subscr_lu(dbc, id0, "712", false) --> 0
|
||||
db_subscr_lu(dbc, id0, "712", false, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -397,7 +397,7 @@ struct hlr_subscriber {
|
|||
|
||||
--- Record LU for PS and CS (SGSN and VLR names) *again*
|
||||
|
||||
db_subscr_lu(dbc, id0, "111", true) --> 0
|
||||
db_subscr_lu(dbc, id0, "111", true, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -408,7 +408,7 @@ struct hlr_subscriber {
|
|||
.sgsn_number = '111',
|
||||
}
|
||||
|
||||
db_subscr_lu(dbc, id0, "111", true) --> 0
|
||||
db_subscr_lu(dbc, id0, "111", true, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -419,7 +419,7 @@ struct hlr_subscriber {
|
|||
.sgsn_number = '111',
|
||||
}
|
||||
|
||||
db_subscr_lu(dbc, id0, "222", false) --> 0
|
||||
db_subscr_lu(dbc, id0, "222", false, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -430,7 +430,7 @@ struct hlr_subscriber {
|
|||
.sgsn_number = '111',
|
||||
}
|
||||
|
||||
db_subscr_lu(dbc, id0, "222", false) --> 0
|
||||
db_subscr_lu(dbc, id0, "222", false, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -444,7 +444,7 @@ struct hlr_subscriber {
|
|||
|
||||
--- Unset LU info for PS and CS (SGSN and VLR names)
|
||||
|
||||
db_subscr_lu(dbc, id0, "", true) --> 0
|
||||
db_subscr_lu(dbc, id0, "", true, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -454,7 +454,7 @@ struct hlr_subscriber {
|
|||
.vlr_number = '222',
|
||||
}
|
||||
|
||||
db_subscr_lu(dbc, id0, "", false) --> 0
|
||||
db_subscr_lu(dbc, id0, "", false, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -463,9 +463,9 @@ struct hlr_subscriber {
|
|||
.msisdn = '543210123456789',
|
||||
}
|
||||
|
||||
db_subscr_lu(dbc, id0, "111", true) --> 0
|
||||
db_subscr_lu(dbc, id0, "111", true, NULL, 0) --> 0
|
||||
|
||||
db_subscr_lu(dbc, id0, "222", false) --> 0
|
||||
db_subscr_lu(dbc, id0, "222", false, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -476,7 +476,7 @@ struct hlr_subscriber {
|
|||
.sgsn_number = '111',
|
||||
}
|
||||
|
||||
db_subscr_lu(dbc, id0, NULL, true) --> 0
|
||||
db_subscr_lu(dbc, id0, NULL, true, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -486,7 +486,7 @@ struct hlr_subscriber {
|
|||
.vlr_number = '222',
|
||||
}
|
||||
|
||||
db_subscr_lu(dbc, id0, NULL, false) --> 0
|
||||
db_subscr_lu(dbc, id0, NULL, false, NULL, 0) --> 0
|
||||
|
||||
db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0
|
||||
struct hlr_subscriber {
|
||||
|
|
@ -498,10 +498,10 @@ struct hlr_subscriber {
|
|||
|
||||
--- Record LU for non-existent ID
|
||||
|
||||
db_subscr_lu(dbc, 99999, "5952", true) --> -ENOENT
|
||||
db_subscr_lu(dbc, 99999, "5952", true, NULL, 0) --> -ENOENT
|
||||
DAUC Cannot update SGSN number for subscriber ID=99999: no such subscriber
|
||||
|
||||
db_subscr_lu(dbc, 99999, "712", false) --> -ENOENT
|
||||
db_subscr_lu(dbc, 99999, "712", false, NULL, 0) --> -ENOENT
|
||||
DAUC Cannot update VLR number for subscriber ID=99999: no such subscriber
|
||||
|
||||
db_subscr_get_by_id(dbc, 99999, &g_subscr) --> -ENOENT
|
||||
|
|
|
|||
Loading…
Reference in New Issue