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 pull request #366 from nickodell/master

Browse Source 
Misc bugfixes
This commit is contained in:
irungentoo 2013-08-06 17:35:26 -07:00
commit d04f2d0e51
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/LAN_discovery.c
View File

@ -70,6 +70,10 @@ static uint32_t get_broadcast(void)
} }
} }
close(sock); close(sock);
if(sock_holder == NULL) {
perror("[!] no broadcast device found");
return 0;
}
return sock_holder->sin_addr.s_addr; return sock_holder->sin_addr.s_addr;
} }

4
core/Messenger.c
View File

@ -116,7 +116,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
return FAERR_ALREADYSENT; return FAERR_ALREADYSENT;
uint32_t i; uint32_t i;
for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
if(friendlist[i].status == NOFRIEND) { if(friendlist[i].status == NOFRIEND) {
DHT_addfriend(client_id); DHT_addfriend(client_id);
friendlist[i].status = FRIEND_ADDED; friendlist[i].status = FRIEND_ADDED;
@ -141,7 +141,7 @@ int m_addfriend_norequest(uint8_t * client_id)
if (getfriend_id(client_id) != -1) if (getfriend_id(client_id) != -1)
return -1; return -1;
uint32_t i; uint32_t i;
for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */ for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
if(friendlist[i].status == NOFRIEND) { if(friendlist[i].status == NOFRIEND) {
DHT_addfriend(client_id); DHT_addfriend(client_id);
friendlist[i].status = FRIEND_REQUESTED; friendlist[i].status = FRIEND_REQUESTED;

2
testing/nTox.c
View File

@ -410,6 +410,8 @@ void load_key(char *path)
} }
} }
if(fclose(data_file) < 0)
perror("[!] fclose failed");
return; return;
FILE_ERROR: FILE_ERROR: