diff options
author | Harald Welte <laforge@gnumonks.org> | 2009-07-05 14:10:01 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2009-07-05 14:10:01 +0200 |
commit | f0465bd6cb530f2a5badb169f70aaa2df1670db4 (patch) | |
tree | 193db7cd4e6667d52f965e419d12c69ccea7c63f /openbsc/include/openbsc/gsm_subscriber.h | |
parent | be3e3784dc435cc64f70b0afef299097f9884c1d (diff) | |
parent | c2e302dc84490691b17fcfa6246e40eaf9a0ab32 (diff) |
Merge branch 'master' into sms
Diffstat (limited to 'openbsc/include/openbsc/gsm_subscriber.h')
-rw-r--r-- | openbsc/include/openbsc/gsm_subscriber.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index e8dbf87f0..b8932e901 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -11,6 +11,18 @@ #define GSM_NAME_LENGTH 128 #define GSM_EXTENSION_LENGTH 128 +struct gsm_equipment { + long long unsigned int id; + char imei[GSM_IMEI_LENGTH]; + 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]; +}; + struct gsm_subscriber { struct gsm_network *net; long long unsigned int id; @@ -21,18 +33,14 @@ struct gsm_subscriber { char extension[GSM_EXTENSION_LENGTH]; int authorized; + /* Every user can only have one equipment in use at any given + * point in time */ + struct gsm_equipment equipment; + /* for internal management */ int use_count; struct llist_head entry; - /* those are properties of the equipment, but they - * are applicable to the subscriber at the moment */ - struct gsm48_classmark1 classmark1; - u_int8_t classmark2_len; - u_int8_t classmark2[3]; - u_int8_t classmark3_len; - u_int8_t classmark3[14]; - /* pending requests */ int in_callback; struct llist_head requests; @@ -48,6 +56,7 @@ enum gsm_subscriber_field { enum gsm_subscriber_update_reason { GSM_SUBSCRIBER_UPDATE_ATTACHED, GSM_SUBSCRIBER_UPDATE_DETACHED, + GSM_SUBSCRIBER_UPDATE_EQUIPMENT, }; struct gsm_subscriber *subscr_get(struct gsm_subscriber *subscr); |