Condense formatting of struct

Modified-by: Travis Cross <tc@traviscross.com>
Signed-off-by: Travis Cross <tc@traviscross.com>
This commit is contained in:
Viktor Krykun 2012-06-15 10:23:13 +03:00 committed by Travis Cross
parent a7d0c274ab
commit fc98238dd6

View File

@ -344,29 +344,15 @@ typedef enum zrtp_statemachine_type_t
*/ */
struct zrtp_global_t struct zrtp_global_t
{ {
/** ZRTP license mode. */ uint32_t lic_mode; /** ZRTP license mode. */
uint32_t lic_mode; zrtp_string16_t client_id; /** Local ZRTP client ID. */
uint8_t is_mitm; /** Flags defines that the local endpoint acts as ZRTP MiTM. */
/** Local ZRTP client ID. */ MD_CTX rand_ctx; /** Hash context for entropy accumulation for the RNG unit. */
zrtp_string16_t client_id; uint8_t rand_initialized; /** RNG unit initialization flag. */
zrtp_string256_t def_cache_path; /** Full path to ZRTP cache file. */
/** Flags defines that the local endpoint acts as ZRTP MiTM. */ unsigned cache_auto_store; /** Set when user wants libzrtp to flush the cache once it changed */
uint8_t is_mitm; zrtp_mutex_t* rng_protector; /** This object is used to protect the shared RNG hash zrtp#rand_ctx */
struct BigNum one; /** This section provides static data for DH3K and DH4K components */
/** Hash context for entropy accumulation for the RNG unit. */
MD_CTX rand_ctx;
/** RNG unit initialization flag. */
uint8_t rand_initialized;
/** Full path to ZRTP cache file. */
zrtp_string256_t def_cache_path;
/** This object is used to protect the shared RNG hash zrtp#rand_ctx */
zrtp_mutex_t* rng_protector;
/** This section provides static data for DH3K and DH4K components */
struct BigNum one;
struct BigNum G; struct BigNum G;
struct BigNum P_2048; struct BigNum P_2048;
struct BigNum P_2048_1; struct BigNum P_2048_1;
@ -374,39 +360,17 @@ struct zrtp_global_t
struct BigNum P_3072_1; struct BigNum P_3072_1;
uint8_t P_2048_data[256]; uint8_t P_2048_data[256];
uint8_t P_3072_data[384]; uint8_t P_3072_data[384];
mlist_t hash_head; /** Head of hash components list */
/** Head of hash components list */ mlist_t cipher_head; /** Head of ciphers list */
mlist_t hash_head; mlist_t atl_head; /** Head of ATL components list */
mlist_t pktype_head; /** Head of public key exchange schemes list */
/** Head of ciphers list */ mlist_t sas_head; /** SAS schemes list */
mlist_t cipher_head; void* srtp_global; /** Storage for some SRTP global data */
mlist_t sessions_head; /** Head of ZRTP sessions list */
/** Head of ATL components list */ uint32_t sessions_count; /** Global sessions count used to create ZRTP session IDs. For debug purposes mostly. */
mlist_t atl_head; uint32_t streams_count; /** Global streams count used to create ZRTP session IDs. For debug purposes mostly. */
zrtp_mutex_t* sessions_protector; /** This object is used to synchronize sessions list operations */
/** Head of public key exchange schemes list */ zrtp_callback_t cb; /** Set of feedback callbacks used by libzrtp to interact with the user-space.*/
mlist_t pktype_head;
/** SAS schemes list */
mlist_t sas_head;
/** Storage for some SRTP global data */
void* srtp_global;
/** Head of ZRTP sessions list */
mlist_t sessions_head;
/** Global sessions count used to create ZRTP session IDs. For debug purposes mostly. */
uint32_t sessions_count;
/** Global streams count used to create ZRTP session IDs. For debug purposes mostly. */
uint32_t streams_count;
/** This object is used to synchronize sessions list operations */
zrtp_mutex_t* sessions_protector;
/** Set of feedback callbacks used by libzrtp to interact with the user-space.*/
zrtp_callback_t cb;
}; };