diff options
author | Sylvain Munaut <tnt@246tNt.com> | 2010-06-09 11:32:51 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2010-06-14 20:43:50 +0200 |
commit | 92b2ff50810159c2e05152c4ecfd70cfd549f208 (patch) | |
tree | 5f9f9a7c8469d4e7e55f19007edd09e5a6098069 | |
parent | 10bf812a6ada275c2066079a29e1f995915c9d3f (diff) |
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>
-rw-r--r-- | openbsc/include/openbsc/db.h | 14 | ||||
-rw-r--r-- | openbsc/src/db.c | 20 | ||||
-rw-r--r-- | openbsc/src/vty_interface_layer3.c | 8 |
3 files changed, 21 insertions, 21 deletions
diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h index c4fc28ae1..2a521f063 100644 --- a/openbsc/include/openbsc/db.h +++ b/openbsc/include/openbsc/db.h @@ -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); diff --git a/openbsc/src/db.c b/openbsc/src/db.c index dd7480467..c6f00de44 100644 --- a/openbsc/src/db.c +++ b/openbsc/src/db.c @@ -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; diff --git a/openbsc/src/vty_interface_layer3.c b/openbsc/src/vty_interface_layer3.c index 0b6da042f..bf88fc093 100644 --- a/openbsc/src/vty_interface_layer3.c +++ b/openbsc/src/vty_interface_layer3.c @@ -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; |