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/gsm_subscriber.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'include/openbsc/gsm_subscriber.h') diff --git a/include/openbsc/gsm_subscriber.h b/include/openbsc/gsm_subscriber.h index c365bc7d7..6cf85731b 100644 --- a/include/openbsc/gsm_subscriber.h +++ b/include/openbsc/gsm_subscriber.h @@ -1,9 +1,8 @@ #ifndef _GSM_SUBSCR_H #define _GSM_SUBSCR_H -#include #include "gsm_data.h" -#include +#include #define GSM_IMEI_LENGTH 17 #define GSM_IMSI_LENGTH 17 @@ -24,24 +23,24 @@ struct gsm_equipment { char name[GSM_NAME_LENGTH]; struct gsm48_classmark1 classmark1; - u_int8_t classmark2_len; - u_int8_t classmark2[3]; - u_int8_t classmark3_len; - u_int8_t classmark3[14]; + uint8_t classmark2_len; + uint8_t classmark2[3]; + uint8_t classmark3_len; + uint8_t classmark3[14]; }; struct gsm_subscriber { struct gsm_network *net; long long unsigned int id; char imsi[GSM_IMSI_LENGTH]; - u_int32_t tmsi; - u_int16_t lac; + uint32_t tmsi; + uint16_t lac; char name[GSM_NAME_LENGTH]; char extension[GSM_EXTENSION_LENGTH]; int authorized; /* Temporary field which is not stored in the DB/HLR */ - u_int32_t flags; + uint32_t flags; /* Every user can only have one equipment in use at any given * point in time */ @@ -72,7 +71,7 @@ enum gsm_subscriber_update_reason { struct gsm_subscriber *subscr_get(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_put(struct gsm_subscriber *subscr); struct gsm_subscriber *subscr_get_by_tmsi(struct gsm_network *net, - u_int32_t tmsi); + uint32_t tmsi); struct gsm_subscriber *subscr_get_by_imsi(struct gsm_network *net, const char *imsi); struct gsm_subscriber *subscr_get_by_extension(struct gsm_network *net, -- cgit v1.2.3