diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2010-06-09 13:03:39 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-06-14 20:43:50 +0200 |
| commit | c614a6a199b1b1ce4ebfe26ca427370488fe8c38 (patch) | |
| tree | 6419f6ed8574e8247dd9232e432271a3a3c258dd /openbsc | |
| parent | b48216f9d1b15fe3e10cac5286a4e4cacc3d9791 (diff) | |
db: Rename AuthTuples to AuthLastTuples
Ultimately, we'll need to store both the last used tuple by a
subscriber and a list of known tuples (for unknown Ki). What's
currently implemented for AuthTuples is the former behavior, so
reflect that.
The second use case will be added as a separate table with separate
accessors later on.
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/include/openbsc/db.h | 8 | ||||
| -rw-r--r-- | openbsc/src/db.c | 18 | ||||
| -rw-r--r-- | openbsc/src/vty_interface_layer3.c | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h index 1782efb50..c4fc28ae1 100644 --- a/openbsc/include/openbsc/db.h +++ b/openbsc/include/openbsc/db.h @@ -48,10 +48,10 @@ int get_authinfo_by_subscr(struct gsm_auth_info *ainfo, struct gsm_subscriber *subscr); int set_authinfo_for_subscr(struct gsm_auth_info *ainfo, struct gsm_subscriber *subscr); -int get_authtuple_by_subscr(struct gsm_auth_tuple *atuple, - struct gsm_subscriber *subscr); -int set_authtuple_for_subscr(struct gsm_auth_tuple *atuple, - struct gsm_subscriber *subscr); +int get_lastauthtuple_by_subscr(struct gsm_auth_tuple *atuple, + struct gsm_subscriber *subscr); +int set_lastauthtuple_for_subscr(struct gsm_auth_tuple *atuple, + struct gsm_subscriber *subscr); /* SMS store-and-forward */ int db_sms_store(struct gsm_sms *sms); diff --git a/openbsc/src/db.c b/openbsc/src/db.c index 7f3c2211c..ad46d98f1 100644 --- a/openbsc/src/db.c +++ b/openbsc/src/db.c @@ -140,7 +140,7 @@ static char *create_stmts[] = { "algorithm_id INTEGER NOT NULL, " "a3a8_ki BLOB " ")", - "CREATE TABLE IF NOT EXISTS AuthTuples (" + "CREATE TABLE IF NOT EXISTS AuthLastTuples (" "id INTEGER PRIMARY KEY AUTOINCREMENT, " "subscriber_id NUMERIC UNIQUE NOT NULL, " "issued TIMESTAMP NOT NULL, " @@ -435,15 +435,15 @@ int set_authinfo_for_subscr(struct gsm_auth_info *ainfo, return 0; } -int get_authtuple_by_subscr(struct gsm_auth_tuple *atuple, - struct gsm_subscriber *subscr) +int get_lastauthtuple_by_subscr(struct gsm_auth_tuple *atuple, + struct gsm_subscriber *subscr) { dbi_result result; int len; const unsigned char *blob; result = dbi_conn_queryf(conn, - "SELECT * FROM AuthTuples WHERE subscriber_id=%u", + "SELECT * FROM AuthLastTuples WHERE subscriber_id=%u", subscr->id); if (!result) return -EIO; @@ -488,8 +488,8 @@ err_size: return -EIO; } -int set_authtuple_for_subscr(struct gsm_auth_tuple *atuple, - struct gsm_subscriber *subscr) +int set_lastauthtuple_for_subscr(struct gsm_auth_tuple *atuple, + struct gsm_subscriber *subscr) { dbi_result result; int rc, upd; @@ -499,7 +499,7 @@ int set_authtuple_for_subscr(struct gsm_auth_tuple *atuple, /* Deletion ? */ if (atuple == NULL) { result = dbi_conn_queryf(conn, - "DELETE FROM AuthTuples WHERE subscriber_id=%u", + "DELETE FROM AuthLastTuples WHERE subscriber_id=%u", subscr->id); if (!result) @@ -511,7 +511,7 @@ int set_authtuple_for_subscr(struct gsm_auth_tuple *atuple, } /* Check if already existing */ - rc = get_authtuple_by_subscr(&atuple_old, subscr); + rc = get_lastauthtuple_by_subscr(&atuple_old, subscr); if (rc && rc != -ENOENT) return rc; upd = rc ? 0 : 1; @@ -526,7 +526,7 @@ int set_authtuple_for_subscr(struct gsm_auth_tuple *atuple, if (!upd) { result = dbi_conn_queryf(conn, - "INSERT INTO AuthTuples " + "INSERT INTO AuthLastTuples " "(subscriber_id, issued, use_count, " "key_seq, rand, sres, kc) " "VALUES (%u, datetime('now'), %u, " diff --git a/openbsc/src/vty_interface_layer3.c b/openbsc/src/vty_interface_layer3.c index 807e165f3..0b6da042f 100644 --- a/openbsc/src/vty_interface_layer3.c +++ b/openbsc/src/vty_interface_layer3.c @@ -100,7 +100,7 @@ static void subscr_dump_full_vty(struct vty *vty, struct gsm_subscriber *subscr) VTY_NEWLINE); } - rc = get_authtuple_by_subscr(&atuple, subscr); + rc = get_lastauthtuple_by_subscr(&atuple, subscr); if (!rc) { vty_out(vty, " A3A8 last tuple (used %d times):%s", atuple.use_count, VTY_NEWLINE); |