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

db: Change naming convention for auth info functions 

- exported function have a 'db_' prefix
 - use 'sync' vs 'set'
 - use 'for' vs 'by'

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2010-06-09 11:32:51 +02:00 committed by Harald Welte
parent 10bf812a6a
commit 92b2ff5081
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openbsc/include/openbsc/db.h
View File

@ -44,14 +44,14 @@ int db_subscriber_assoc_imei(struct gsm_subscriber* subscriber, char *imei);
int db_sync_equipment(struct gsm_equipment *equip);
/* auth info */
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_lastauthtuple_by_subscr(struct gsm_auth_tuple *atuple,
int db_get_authinfo_for_subscr(struct gsm_auth_info *ainfo,
struct gsm_subscriber *subscr);
int db_sync_authinfo_for_subscr(struct gsm_auth_info *ainfo,
struct gsm_subscriber *subscr);
int set_lastauthtuple_for_subscr(struct gsm_auth_tuple *atuple,
struct gsm_subscriber *subscr);
int db_get_lastauthtuple_for_subscr(struct gsm_auth_tuple *atuple,
struct gsm_subscriber *subscr);
int db_sync_lastauthtuple_for_subscr(struct gsm_auth_tuple *atuple,
struct gsm_subscriber *subscr);
/* SMS store-and-forward */
int db_sms_store(struct gsm_sms *sms);

20
openbsc/src/db.c
View File

@ -348,8 +348,8 @@ static int get_equipment_by_subscr(struct gsm_subscriber *subscr)
return 0;
}
int get_authinfo_by_subscr(struct gsm_auth_info *ainfo,
struct gsm_subscriber *subscr)
int db_get_authinfo_for_subscr(struct gsm_auth_info *ainfo,
struct gsm_subscriber *subscr)
{
dbi_result result;
const unsigned char *a3a8_ki;
@ -377,8 +377,8 @@ int get_authinfo_by_subscr(struct gsm_auth_info *ainfo,
return 0;
}
int set_authinfo_for_subscr(struct gsm_auth_info *ainfo,
struct gsm_subscriber *subscr)
int db_sync_authinfo_for_subscr(struct gsm_auth_info *ainfo,
struct gsm_subscriber *subscr)
{
dbi_result result;
struct gsm_auth_info ainfo_old;
@ -400,7 +400,7 @@ int set_authinfo_for_subscr(struct gsm_auth_info *ainfo,
}
/* Check if already existing */
rc = get_authinfo_by_subscr(&ainfo_old, subscr);
rc = db_get_authinfo_for_subscr(&ainfo_old, subscr);
if (rc && rc != -ENOENT)
return rc;
upd = rc ? 0 : 1;
@ -433,8 +433,8 @@ int set_authinfo_for_subscr(struct gsm_auth_info *ainfo,
return 0;
}
int get_lastauthtuple_by_subscr(struct gsm_auth_tuple *atuple,
struct gsm_subscriber *subscr)
int db_get_lastauthtuple_for_subscr(struct gsm_auth_tuple *atuple,
struct gsm_subscriber *subscr)
{
dbi_result result;
int len;
@ -486,8 +486,8 @@ err_size:
return -EIO;
}
int set_lastauthtuple_for_subscr(struct gsm_auth_tuple *atuple,
struct gsm_subscriber *subscr)
int db_sync_lastauthtuple_for_subscr(struct gsm_auth_tuple *atuple,
struct gsm_subscriber *subscr)
{
dbi_result result;
int rc, upd;
@ -509,7 +509,7 @@ int set_lastauthtuple_for_subscr(struct gsm_auth_tuple *atuple,
}
/* Check if already existing */
rc = get_lastauthtuple_by_subscr(&atuple_old, subscr);
rc = db_get_lastauthtuple_for_subscr(&atuple_old, subscr);
if (rc && rc != -ENOENT)
return rc;
upd = rc ? 0 : 1;

8
openbsc/src/vty_interface_layer3.c
View File

@ -91,7 +91,7 @@ static void subscr_dump_full_vty(struct vty *vty, struct gsm_subscriber *subscr)
vty_out(vty, " TMSI: %08X%s", subscr->tmsi,
VTY_NEWLINE);
rc = get_authinfo_by_subscr(&ainfo, subscr);
rc = db_get_authinfo_for_subscr(&ainfo, subscr);
if (!rc) {
vty_out(vty, " A3A8 algorithm id: %d%s",
ainfo.auth_algo, VTY_NEWLINE);
@ -100,7 +100,7 @@ static void subscr_dump_full_vty(struct vty *vty, struct gsm_subscriber *subscr)
VTY_NEWLINE);
}
rc = get_lastauthtuple_by_subscr(&atuple, subscr);
rc = db_get_lastauthtuple_for_subscr(&atuple, subscr);
if (!rc) {
vty_out(vty, " A3A8 last tuple (used %d times):%s",
atuple.use_count, VTY_NEWLINE);
@ -469,7 +469,7 @@ DEFUN(ena_subscr_a3a8,
if (!strcasecmp(alg_str, "none")) {
/* Just erase */
rc = set_authinfo_for_subscr(NULL, subscr);
rc = db_sync_authinfo_for_subscr(NULL, subscr);
} else if (!strcasecmp(alg_str, "comp128v1")) {
/* Parse hex string Ki */
rc = hexparse(ki_str, ainfo.a3a8_ki, sizeof(ainfo.a3a8_ki));
@ -479,7 +479,7 @@ DEFUN(ena_subscr_a3a8,
/* Set the infos */
ainfo.auth_algo = AUTH_ALGO_COMP128v1;
ainfo.a3a8_ki_len = rc;
rc = set_authinfo_for_subscr(&ainfo, subscr);
rc = db_sync_authinfo_for_subscr(&ainfo, subscr);
} else {
/* Unknown method */
return CMD_WARNING;