diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/Messenger.c | 88 | ||||
-rw-r--r-- | core/Messenger.h | 38 |
2 files changed, 102 insertions, 24 deletions
diff --git a/core/Messenger.c b/core/Messenger.c index 57d485bb..d8bf3413 100644 --- a/core/Messenger.c +++ b/core/Messenger.c | |||
@@ -35,6 +35,7 @@ typedef struct { | |||
35 | uint8_t *userstatus; | 35 | uint8_t *userstatus; |
36 | uint16_t userstatus_length; | 36 | uint16_t userstatus_length; |
37 | uint8_t userstatus_sent; | 37 | uint8_t userstatus_sent; |
38 | USERSTATUS_KIND userstatus_kind; | ||
38 | uint16_t info_size; /* length of the info */ | 39 | uint16_t info_size; /* length of the info */ |
39 | } Friend; | 40 | } Friend; |
40 | 41 | ||
@@ -45,6 +46,7 @@ static uint16_t self_name_length; | |||
45 | 46 | ||
46 | static uint8_t *self_userstatus; | 47 | static uint8_t *self_userstatus; |
47 | static uint16_t self_userstatus_len; | 48 | static uint16_t self_userstatus_len; |
49 | static USERSTATUS_KIND self_userstatus_kind; | ||
48 | 50 | ||
49 | #define MAX_NUM_FRIENDS 256 | 51 | #define MAX_NUM_FRIENDS 256 |
50 | 52 | ||
@@ -98,12 +100,12 @@ int getclient_id(int friend_id, uint8_t *client_id) | |||
98 | * return FAERR_NOMESSAGE if no message (message length must be >= 1 byte) | 100 | * return FAERR_NOMESSAGE if no message (message length must be >= 1 byte) |
99 | * return FAERR_OWNKEY if user's own key | 101 | * return FAERR_OWNKEY if user's own key |
100 | * return FAERR_ALREADYSENT if friend request already sent or already a friend | 102 | * return FAERR_ALREADYSENT if friend request already sent or already a friend |
101 | * return FAERR_UNKNOWN for unknown error | 103 | * return FAERR_UNKNOWN for unknown error |
102 | */ | 104 | */ |
103 | int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length) | 105 | int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length) |
104 | { | 106 | { |
105 | if (length >= (MAX_DATA_SIZE - crypto_box_PUBLICKEYBYTES | 107 | if (length >= (MAX_DATA_SIZE - crypto_box_PUBLICKEYBYTES |
106 | - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES | 108 | - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES |
107 | + crypto_box_ZEROBYTES)) | 109 | + crypto_box_ZEROBYTES)) |
108 | return FAERR_TOOLONG; | 110 | return FAERR_TOOLONG; |
109 | if (length < 1) | 111 | if (length < 1) |
@@ -123,6 +125,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length) | |||
123 | memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE); | 125 | memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE); |
124 | friendlist[i].userstatus = calloc(1, 1); | 126 | friendlist[i].userstatus = calloc(1, 1); |
125 | friendlist[i].userstatus_length = 1; | 127 | friendlist[i].userstatus_length = 1; |
128 | friendlist[i].userstatus_kind = USERSTATUS_KIND_OFFLINE; | ||
126 | memcpy(friendlist[i].info, data, length); | 129 | memcpy(friendlist[i].info, data, length); |
127 | friendlist[i].info_size = length; | 130 | friendlist[i].info_size = length; |
128 | 131 | ||
@@ -205,7 +208,7 @@ int m_sendmessage(int friendnumber, uint8_t *message, uint32_t length) | |||
205 | return write_cryptpacket(friendlist[friendnumber].crypt_connection_id, temp, length + 1); | 208 | return write_cryptpacket(friendlist[friendnumber].crypt_connection_id, temp, length + 1); |
206 | } | 209 | } |
207 | 210 | ||
208 | /* send a name packet to friendnumber | 211 | /* send a name packet to friendnumber |
209 | length is the length with the NULL terminator*/ | 212 | length is the length with the NULL terminator*/ |
210 | static int m_sendname(int friendnumber, uint8_t * name, uint16_t length) | 213 | static int m_sendname(int friendnumber, uint8_t * name, uint16_t length) |
211 | { | 214 | { |
@@ -247,14 +250,14 @@ int setname(uint8_t * name, uint16_t length) | |||
247 | } | 250 | } |
248 | 251 | ||
249 | /* get our nickname | 252 | /* get our nickname |
250 | put it in name | 253 | put it in name |
251 | name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH bytes. | 254 | name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH bytes. |
252 | return the length of the name */ | 255 | return the length of the name */ |
253 | uint16_t getself_name(uint8_t *name) | 256 | uint16_t getself_name(uint8_t *name) |
254 | { | 257 | { |
255 | memcpy(name, self_name, self_name_length); | 258 | memcpy(name, self_name, self_name_length); |
256 | return self_name_length; | 259 | return self_name_length; |
257 | } | 260 | } |
258 | 261 | ||
259 | /* get name of friendnumber | 262 | /* get name of friendnumber |
260 | put it in name | 263 | put it in name |
@@ -269,10 +272,13 @@ int getname(int friendnumber, uint8_t * name) | |||
269 | return 0; | 272 | return 0; |
270 | } | 273 | } |
271 | 274 | ||
272 | int m_set_userstatus(uint8_t *status, uint16_t length) | 275 | int m_set_userstatus(USERSTATUS_KIND kind, uint8_t *status, uint16_t length) |
273 | { | 276 | { |
274 | if (length > MAX_USERSTATUS_LENGTH) | 277 | if (length > MAX_USERSTATUS_LENGTH) |
275 | return -1; | 278 | return -1; |
279 | if (kind != USERSTATUS_KIND_RETAIN) { | ||
280 | self_userstatus_kind = kind; | ||
281 | } | ||
276 | uint8_t *newstatus = calloc(length, 1); | 282 | uint8_t *newstatus = calloc(length, 1); |
277 | memcpy(newstatus, status, length); | 283 | memcpy(newstatus, status, length); |
278 | free(self_userstatus); | 284 | free(self_userstatus); |
@@ -285,6 +291,20 @@ int m_set_userstatus(uint8_t *status, uint16_t length) | |||
285 | return 0; | 291 | return 0; |
286 | } | 292 | } |
287 | 293 | ||
294 | int m_set_userstatus_kind(USERSTATUS_KIND kind) { | ||
295 | if (kind >= USERSTATUS_KIND_INVALID) { | ||
296 | return -1; | ||
297 | } | ||
298 | if (kind == USERSTATUS_KIND_RETAIN) { | ||
299 | return 0; | ||
300 | } | ||
301 | self_userstatus_kind = kind; | ||
302 | uint32_t i; | ||
303 | for (i = 0; i < numfriends; ++i) | ||
304 | friendlist[i].userstatus_sent = 0; | ||
305 | return 0; | ||
306 | } | ||
307 | |||
288 | /* return the size of friendnumber's user status | 308 | /* return the size of friendnumber's user status |
289 | guaranteed to be at most MAX_USERSTATUS_LENGTH */ | 309 | guaranteed to be at most MAX_USERSTATUS_LENGTH */ |
290 | int m_get_userstatus_size(int friendnumber) | 310 | int m_get_userstatus_size(int friendnumber) |
@@ -305,11 +325,33 @@ int m_copy_userstatus(int friendnumber, uint8_t * buf, uint32_t maxlen) | |||
305 | return 0; | 325 | return 0; |
306 | } | 326 | } |
307 | 327 | ||
328 | int m_copy_self_userstatus(uint8_t * buf, uint32_t maxlen) | ||
329 | { | ||
330 | memset(buf, 0, maxlen); | ||
331 | memcpy(buf, self_userstatus, MIN(maxlen, MAX_USERSTATUS_LENGTH) - 1); | ||
332 | return 0; | ||
333 | } | ||
334 | |||
335 | USERSTATUS_KIND m_get_userstatus_kind(int friendnumber) { | ||
336 | if (friendnumber >= numfriends || friendnumber < 0) | ||
337 | return USERSTATUS_KIND_INVALID; | ||
338 | USERSTATUS_KIND uk = friendlist[friendnumber].userstatus_kind; | ||
339 | if (uk >= USERSTATUS_KIND_INVALID) { | ||
340 | uk = USERSTATUS_KIND_ONLINE; | ||
341 | } | ||
342 | return uk; | ||
343 | } | ||
344 | |||
345 | USERSTATUS_KIND m_get_self_userstatus_kind(void) { | ||
346 | return self_userstatus_kind; | ||
347 | } | ||
348 | |||
308 | static int send_userstatus(int friendnumber, uint8_t * status, uint16_t length) | 349 | static int send_userstatus(int friendnumber, uint8_t * status, uint16_t length) |
309 | { | 350 | { |
310 | uint8_t *thepacket = malloc(length + 1); | 351 | uint8_t *thepacket = malloc(length + 2); |
311 | memcpy(thepacket + 1, status, length); | 352 | memcpy(thepacket + 2, status, length); |
312 | thepacket[0] = PACKET_ID_USERSTATUS; | 353 | thepacket[0] = PACKET_ID_USERSTATUS; |
354 | thepacket[1] = self_userstatus_kind; | ||
313 | int written = write_cryptpacket(friendlist[friendnumber].crypt_connection_id, thepacket, length + 1); | 355 | int written = write_cryptpacket(friendlist[friendnumber].crypt_connection_id, thepacket, length + 1); |
314 | free(thepacket); | 356 | free(thepacket); |
315 | return written; | 357 | return written; |
@@ -327,6 +369,11 @@ static int set_friend_userstatus(int friendnumber, uint8_t * status, uint16_t le | |||
327 | return 0; | 369 | return 0; |
328 | } | 370 | } |
329 | 371 | ||
372 | static void set_friend_userstatus_kind(int friendnumber, USERSTATUS_KIND k) | ||
373 | { | ||
374 | friendlist[friendnumber].userstatus_kind = k; | ||
375 | } | ||
376 | |||
330 | /* static void (*friend_request)(uint8_t *, uint8_t *, uint16_t); | 377 | /* static void (*friend_request)(uint8_t *, uint8_t *, uint16_t); |
331 | static uint8_t friend_request_isset = 0; */ | 378 | static uint8_t friend_request_isset = 0; */ |
332 | /* set the function that will be executed when a friend request is received. */ | 379 | /* set the function that will be executed when a friend request is received. */ |
@@ -353,9 +400,9 @@ void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t)) | |||
353 | friend_namechange_isset = 1; | 400 | friend_namechange_isset = 1; |
354 | } | 401 | } |
355 | 402 | ||
356 | static void (*friend_statuschange)(int, uint8_t *, uint16_t); | 403 | static void (*friend_statuschange)(int, USERSTATUS_KIND, uint8_t *, uint16_t); |
357 | static uint8_t friend_statuschange_isset = 0; | 404 | static uint8_t friend_statuschange_isset = 0; |
358 | void m_callback_userstatus(void (*function)(int, uint8_t *, uint16_t)) | 405 | void m_callback_userstatus(void (*function)(int, USERSTATUS_KIND, uint8_t *, uint16_t)) |
359 | { | 406 | { |
360 | friend_statuschange = function; | 407 | friend_statuschange = function; |
361 | friend_statuschange_isset = 1; | 408 | friend_statuschange_isset = 1; |
@@ -366,7 +413,7 @@ void m_callback_userstatus(void (*function)(int, uint8_t *, uint16_t)) | |||
366 | int initMessenger(void) | 413 | int initMessenger(void) |
367 | { | 414 | { |
368 | new_keys(); | 415 | new_keys(); |
369 | m_set_userstatus((uint8_t*)"Online", sizeof("Online")); | 416 | m_set_userstatus(USERSTATUS_KIND_ONLINE, (uint8_t*)"Online", sizeof("Online")); |
370 | initNetCrypto(); | 417 | initNetCrypto(); |
371 | IP ip; | 418 | IP ip; |
372 | ip.i = 0; | 419 | ip.i = 0; |
@@ -438,12 +485,17 @@ static void doFriends(void) | |||
438 | break; | 485 | break; |
439 | } | 486 | } |
440 | case PACKET_ID_USERSTATUS: { | 487 | case PACKET_ID_USERSTATUS: { |
441 | uint8_t *status = calloc(MIN(len - 1, MAX_USERSTATUS_LENGTH), 1); | 488 | if (len > 2) { |
442 | memcpy(status, temp + 1, MIN(len - 1, MAX_USERSTATUS_LENGTH)); | 489 | uint8_t *status = calloc(MIN(len - 2, MAX_USERSTATUS_LENGTH), 1); |
443 | if (friend_statuschange_isset) | 490 | memcpy(status, temp + 2, MIN(len - 2, MAX_USERSTATUS_LENGTH)); |
444 | friend_statuschange(i, status, MIN(len - 1, MAX_USERSTATUS_LENGTH)); | 491 | if (friend_statuschange_isset) |
445 | set_friend_userstatus(i, status, MIN(len - 1, MAX_USERSTATUS_LENGTH)); | 492 | friend_statuschange(i, temp[1], status, MIN(len - 2, MAX_USERSTATUS_LENGTH)); |
446 | free(status); | 493 | set_friend_userstatus(i, status, MIN(len - 2, MAX_USERSTATUS_LENGTH)); |
494 | free(status); | ||
495 | } else if (friend_statuschange_isset) { | ||
496 | friend_statuschange(i, temp[1], friendlist[i].userstatus, friendlist[i].userstatus_length); | ||
497 | } | ||
498 | set_friend_userstatus_kind(i, temp[1]); | ||
447 | break; | 499 | break; |
448 | } | 500 | } |
449 | case PACKET_ID_MESSAGE: { | 501 | case PACKET_ID_MESSAGE: { |
diff --git a/core/Messenger.h b/core/Messenger.h index 20b38caa..8940aadd 100644 --- a/core/Messenger.h +++ b/core/Messenger.h | |||
@@ -60,6 +60,22 @@ extern "C" { | |||
60 | /* don't assume MAX_USERSTATUS_LENGTH will stay at 128, it may be increased | 60 | /* don't assume MAX_USERSTATUS_LENGTH will stay at 128, it may be increased |
61 | to an absurdly large number later */ | 61 | to an absurdly large number later */ |
62 | 62 | ||
63 | /* USERSTATUS_KIND | ||
64 | * Represents the different kinds of userstatus | ||
65 | * someone can have. | ||
66 | * More on this later... */ | ||
67 | |||
68 | typedef enum { | ||
69 | USERSTATUS_KIND_RETAIN = (uint8_t)0, /* This is a special value that must not be returned by | ||
70 | * m_get_userstatus_kind. You can pass it into m_set_userstatus | ||
71 | * to keep the current USERSTATUS_KIND. */ | ||
72 | USERSTATUS_KIND_ONLINE, /* Recommended representation: Green. */ | ||
73 | USERSTATUS_KIND_AWAY, /* Recommended representation: Orange, or yellow. */ | ||
74 | USERSTATUS_KIND_BUSY, /* Recommended representation: Red. */ | ||
75 | USERSTATUS_KIND_OFFLINE, /* Recommended representation: Grey, semi-transparent. */ | ||
76 | USERSTATUS_KIND_INVALID, | ||
77 | } USERSTATUS_KIND; | ||
78 | |||
63 | /* | 79 | /* |
64 | * add a friend | 80 | * add a friend |
65 | * set the data that will be sent along with friend request | 81 | * set the data that will be sent along with friend request |
@@ -70,7 +86,7 @@ extern "C" { | |||
70 | * return -2 if no message (message length must be >= 1 byte) | 86 | * return -2 if no message (message length must be >= 1 byte) |
71 | * return -3 if user's own key | 87 | * return -3 if user's own key |
72 | * return -4 if friend request already sent or already a friend | 88 | * return -4 if friend request already sent or already a friend |
73 | * return -5 for unknown error | 89 | * return -5 for unknown error |
74 | */ | 90 | */ |
75 | int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length); | 91 | int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length); |
76 | 92 | ||
@@ -114,7 +130,7 @@ int m_sendmessage(int friendnumber, uint8_t *message, uint32_t length); | |||
114 | int setname(uint8_t *name, uint16_t length); | 130 | int setname(uint8_t *name, uint16_t length); |
115 | 131 | ||
116 | /* get our nickname | 132 | /* get our nickname |
117 | put it in name | 133 | put it in name |
118 | return the length of the name*/ | 134 | return the length of the name*/ |
119 | uint16_t getself_name(uint8_t *name); | 135 | uint16_t getself_name(uint8_t *name); |
120 | 136 | ||
@@ -128,7 +144,8 @@ int getname(int friendnumber, uint8_t *name); | |||
128 | /* set our user status | 144 | /* set our user status |
129 | you are responsible for freeing status after | 145 | you are responsible for freeing status after |
130 | returns 0 on success, -1 on failure */ | 146 | returns 0 on success, -1 on failure */ |
131 | int m_set_userstatus(uint8_t *status, uint16_t length); | 147 | int m_set_userstatus(USERSTATUS_KIND kind, uint8_t *status, uint16_t length); |
148 | int m_set_userstatus_kind(USERSTATUS_KIND kind); | ||
132 | 149 | ||
133 | /* return the length of friendnumber's user status, | 150 | /* return the length of friendnumber's user status, |
134 | including null | 151 | including null |
@@ -136,8 +153,17 @@ int m_set_userstatus(uint8_t *status, uint16_t length); | |||
136 | int m_get_userstatus_size(int friendnumber); | 153 | int m_get_userstatus_size(int friendnumber); |
137 | 154 | ||
138 | /* copy friendnumber's userstatus into buf, truncating if size is over maxlen | 155 | /* copy friendnumber's userstatus into buf, truncating if size is over maxlen |
139 | get the size you need to allocate from m_get_userstatus_size */ | 156 | get the size you need to allocate from m_get_userstatus_size |
157 | The self variant will copy our own userstatus. */ | ||
140 | int m_copy_userstatus(int friendnumber, uint8_t *buf, uint32_t maxlen); | 158 | int m_copy_userstatus(int friendnumber, uint8_t *buf, uint32_t maxlen); |
159 | int m_copy_self_userstatus(uint8_t *buf, uint32_t maxlen); | ||
160 | |||
161 | /* Return one of USERSTATUS_KIND values, except USERSTATUS_KIND_RETAIN. | ||
162 | * Values unknown to your application should be represented as USERSTATUS_KIND_ONLINE. | ||
163 | * As above, the self variant will return our own USERSTATUS_KIND. | ||
164 | * If friendnumber is invalid, this shall return USERSTATUS_KIND_INVALID. */ | ||
165 | USERSTATUS_KIND m_get_userstatus_kind(int friendnumber); | ||
166 | USERSTATUS_KIND m_get_self_userstatus_kind(void); | ||
141 | 167 | ||
142 | /* set the function that will be executed when a friend request is received. | 168 | /* set the function that will be executed when a friend request is received. |
143 | function format is function(uint8_t * public_key, uint8_t * data, uint16_t length) */ | 169 | function format is function(uint8_t * public_key, uint8_t * data, uint16_t length) */ |
@@ -153,9 +179,9 @@ void m_callback_friendmessage(void (*function)(int, uint8_t *, uint16_t)); | |||
153 | void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t)); | 179 | void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t)); |
154 | 180 | ||
155 | /* set the callback for user status changes | 181 | /* set the callback for user status changes |
156 | function(int friendnumber, uint8_t *newstatus, uint16_t length) | 182 | function(int friendnumber, USERSTATUS_KIND kind, uint8_t *newstatus, uint16_t length) |
157 | you are not responsible for freeing newstatus */ | 183 | you are not responsible for freeing newstatus */ |
158 | void m_callback_userstatus(void (*function)(int, uint8_t *, uint16_t)); | 184 | void m_callback_userstatus(void (*function)(int, USERSTATUS_KIND, uint8_t *, uint16_t)); |
159 | 185 | ||
160 | /* run this at startup | 186 | /* run this at startup |
161 | returns 0 if no connection problems | 187 | returns 0 if no connection problems |