StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'patch-3' of https://github.com/Astonex/ProjectTox-Core into Astonex-patch-3

Browse Source
This commit is contained in:
irungentoo 2013-07-30 19:28:36 -04:00
commit f6d508735a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/Messenger.c
View File

@ -99,16 +99,19 @@ int getclient_id(int friend_id, uint8_t *client_id)
client_id is the client id of the friend
data is the data and length is the length
returns the friend number if success
return -1 if failure. */
return -1 if key length is wrong.
return -2 if user's own key
return -3 if already a friend
return -4 for other*/
int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
{
if (length == 0 || length >=
(MAX_DATA_SIZE - crypto_box_PUBLICKEYBYTES - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES + crypto_box_ZEROBYTES))
return -1;
if (memcmp(client_id, self_public_key, crypto_box_PUBLICKEYBYTES) == 0)
return -1;
return -2;
if (getfriend_id(client_id) != -1)
return -1;
return -3;
uint32_t i;
for (i = 0; i <= numfriends; ++i) {
if(friendlist[i].status == 0) {
@ -126,7 +129,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
return i;
}
}
return -1;
return -4;
}
int m_addfriend_norequest(uint8_t * client_id)