summaryrefslogtreecommitdiff
path: root/toxav/msi.h
diff options
context:
space:
mode:
authormannol <eniz_vukovic@hotmail.com>2014-05-20 00:27:02 +0200
committermannol <eniz_vukovic@hotmail.com>2014-05-20 00:27:02 +0200
commitc9f1c6882dbf986685e3a900dae516f06832393c (patch)
tree6529505163b9a0d4fd0cb6c4aac0a19c5a108fb1 /toxav/msi.h
parenta1f2a18ae4146ebea11fbd3f83df803b715813da (diff)
parentfc19327dccedf7950377856c3b09a13f2b0f5911 (diff)
Merge upstream fo real now?
Diffstat (limited to 'toxav/msi.h')
-rwxr-xr-xtoxav/msi.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/toxav/msi.h b/toxav/msi.h
index e9e1b4d7..2d4929a6 100755
--- a/toxav/msi.h
+++ b/toxav/msi.h
@@ -72,21 +72,22 @@ typedef struct _MSICall { /* Call info structure */
72 72
73 uint8_t id[CALL_ID_LEN]; /* Random value identifying the call */ 73 uint8_t id[CALL_ID_LEN]; /* Random value identifying the call */
74 74
75 uint8_t *key_local; /* The key for encryption */ 75 uint8_t *key_local; /* The key for encryption */
76 uint8_t *key_peer; /* The key for decryption */ 76 uint8_t *key_peer; /* The key for decryption */
77 77
78 uint8_t *nonce_local; /* Local nonce */ 78 uint8_t *nonce_local; /* Local nonce */
79 uint8_t *nonce_peer; /* Peer nonce */ 79 uint8_t *nonce_peer; /* Peer nonce */
80 80
81 int ringing_tout_ms; /* Ringing timeout in ms */ 81 int ringing_tout_ms; /* Ringing timeout in ms */
82 82
83 int request_timer_id; /* Timer id for outgoing request/action */ 83 int request_timer_id; /* Timer id for outgoing request/action */
84 int ringing_timer_id; /* Timer id for ringing timeout */ 84 int ringing_timer_id; /* Timer id for ringing timeout */
85 85
86
86 pthread_mutex_t mutex; /* It's to be assumed that call will have 87 pthread_mutex_t mutex; /* It's to be assumed that call will have
87 * separate thread so add mutex 88 * separate thread so add mutex
88 */ 89 */
89 uint32_t *peers; 90 uint32_t *peers;
90 uint16_t peer_count; 91 uint16_t peer_count;
91 92
92 int32_t call_idx; /* Index of this call in MSISession */ 93 int32_t call_idx; /* Index of this call in MSISession */