diff options
| author | charmlesscoin <charmlesscoin@gmail.com> | 2013-08-07 15:22:57 -0400 |
|---|---|---|
| committer | charmlesscoin <charmlesscoin@gmail.com> | 2013-08-07 15:22:57 -0400 |
| commit | 0f664f3122af9b29cece1a6342b343af0d06d63f (patch) | |
| tree | b1da9ec5795e5ecd95d1bc50875e43815f154881 /core/Messenger.c | |
| parent | 64b05c09601c1a0f45674384daa5f25be530bc34 (diff) | |
| parent | dda22a016774742588b88aac81d2267628758491 (diff) | |
Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core into auto_tests
Diffstat (limited to 'core/Messenger.c')
| -rw-r--r-- | core/Messenger.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/Messenger.c b/core/Messenger.c index 5532c9cc..4e994a15 100644 --- a/core/Messenger.c +++ b/core/Messenger.c | |||
| @@ -116,8 +116,8 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length) | |||
| 116 | return FAERR_ALREADYSENT; | 116 | return FAERR_ALREADYSENT; |
| 117 | 117 | ||
| 118 | uint32_t i; | 118 | uint32_t i; |
| 119 | for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ | 119 | for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ |
| 120 | if(friendlist[i].status == NOFRIEND) { | 120 | if (friendlist[i].status == NOFRIEND) { |
| 121 | DHT_addfriend(client_id); | 121 | DHT_addfriend(client_id); |
| 122 | friendlist[i].status = FRIEND_ADDED; | 122 | friendlist[i].status = FRIEND_ADDED; |
| 123 | friendlist[i].crypt_connection_id = -1; | 123 | friendlist[i].crypt_connection_id = -1; |
| @@ -141,7 +141,7 @@ int m_addfriend_norequest(uint8_t * client_id) | |||
| 141 | if (getfriend_id(client_id) != -1) | 141 | if (getfriend_id(client_id) != -1) |
| 142 | return -1; | 142 | return -1; |
| 143 | uint32_t i; | 143 | uint32_t i; |
| 144 | for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ | 144 | for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ |
| 145 | if(friendlist[i].status == NOFRIEND) { | 145 | if(friendlist[i].status == NOFRIEND) { |
| 146 | DHT_addfriend(client_id); | 146 | DHT_addfriend(client_id); |
| 147 | friendlist[i].status = FRIEND_REQUESTED; | 147 | friendlist[i].status = FRIEND_REQUESTED; |