From 5a45b156d4165fed159a290c46676d1383ffcc80 Mon Sep 17 00:00:00 2001 From: Jonathan Santos Date: Wed, 17 Aug 2011 15:33:57 -0400 Subject: New upstream version 0.9.14 --- include/openbsc/db.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'include/openbsc/db.h') diff --git a/include/openbsc/db.h b/include/openbsc/db.h index a939b0d63..37011a16e 100644 --- a/include/openbsc/db.h +++ b/include/openbsc/db.h @@ -20,7 +20,7 @@ #ifndef _DB_H #define _DB_H -#include +#include "gsm_subscriber.h" struct gsm_equipment; struct gsm_network; @@ -29,8 +29,6 @@ struct gsm_auth_tuple; struct gsm_sms; struct gsm_subscriber; -enum gsm_subscriber_field; - /* one time initialisation */ int db_init(const char *name); int db_prepare(); @@ -45,7 +43,7 @@ struct gsm_subscriber *db_get_subscriber(struct gsm_network *net, int db_sync_subscriber(struct gsm_subscriber *subscriber); int db_subscriber_alloc_tmsi(struct gsm_subscriber *subscriber); int db_subscriber_alloc_exten(struct gsm_subscriber *subscriber); -int db_subscriber_alloc_token(struct gsm_subscriber *subscriber, u_int32_t* token); +int db_subscriber_alloc_token(struct gsm_subscriber *subscriber, uint32_t* token); int db_subscriber_assoc_imei(struct gsm_subscriber *subscriber, char *imei); int db_sync_equipment(struct gsm_equipment *equip); int db_subscriber_update(struct gsm_subscriber *subscriber); @@ -71,12 +69,12 @@ int db_sms_inc_deliver_attempts(struct gsm_sms *sms); /* APDU blob storage */ int db_apdu_blob_store(struct gsm_subscriber *subscr, - u_int8_t apdu_id_flags, u_int8_t len, - u_int8_t *apdu); + uint8_t apdu_id_flags, uint8_t len, + uint8_t *apdu); /* Statistics counter storage */ -struct counter; -int db_store_counter(struct counter *ctr); +struct osmo_counter; +int db_store_counter(struct osmo_counter *ctr); struct rate_ctr_group; int db_store_rate_ctr_group(struct rate_ctr_group *ctrg); -- cgit v1.2.3