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

network.c:

Browse Source 
- undo "fixing" the wrong variable
- fix the logging in receivepacket()
This commit is contained in:
Coren[m] 2013-09-11 15:47:29 +02:00
parent d35fee43ba
commit be716af15d
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
toxcore/network.c
View File

@ -148,7 +148,6 @@ static int receivepacket(sock_t sock, IP_Port *ip_port, uint8_t *data, uint32_t
#else #else
uint32_t addrlen = sizeof(addr); uint32_t addrlen = sizeof(addr);
#endif #endif
uint32_t bufflen = *length;
(*(int32_t *)length) = recvfrom(sock, (char *) data, MAX_UDP_PACKET_SIZE, 0, (struct sockaddr *)&addr, &addrlen); (*(int32_t *)length) = recvfrom(sock, (char *) data, MAX_UDP_PACKET_SIZE, 0, (struct sockaddr *)&addr, &addrlen);
if (*(int32_t *)length <= 0) { if (*(int32_t *)length <= 0) {
@ -187,7 +186,7 @@ static int receivepacket(sock_t sock, IP_Port *ip_port, uint8_t *data, uint32_t
#endif #endif
#ifdef LOGGING #ifdef LOGGING
loglogdata("=>O", data, bufflen, ip_port, *length); loglogdata("=>O", data, MAX_UDP_PACKET_SIZE, ip_port, *length);
#endif #endif
return 0; return 0;
@ -204,18 +203,14 @@ void networking_poll(Networking_Core *net)
IP_Port ip_port; IP_Port ip_port;
uint8_t data[MAX_UDP_PACKET_SIZE]; uint8_t data[MAX_UDP_PACKET_SIZE];
uint32_t length; uint32_t length;
int recverr;
do {
length = sizeof(data);
recverr = receivepacket(net->sock, &ip_port, data, &length);
if (!recverr && (length > 0)) {
if (!(net->packethandlers[data[0]].function))
continue;
net->packethandlers[data[0]].function(net->packethandlers[data[0]].object, while (receivepacket(net->sock, &ip_port, data, &length) != -1) {
ip_port, data, length); if (length < 1) continue;
}
} while (recverr != -1); if (!(net->packethandlers[data[0]].function)) continue;
net->packethandlers[data[0]].function(net->packethandlers[data[0]].object, ip_port, data, length);
}
} }
uint8_t at_startup_ran = 0; uint8_t at_startup_ran = 0;