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

minimalistic increase in elegance ;)

Browse Source 
DHT.c:
- loops over assoc4/6 slightly more elegant
This commit is contained in:
Coren[m] 2013-09-27 18:33:52 +02:00
parent 9de295374d
commit 06a85177e9
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
toxcore/DHT.c
View File

@ -1010,14 +1010,10 @@ static void get_bunchnodes(DHT *dht, Client_data *list, uint16_t length, uint16_
IPPTsPng *assoc; IPPTsPng *assoc;
#ifdef CLIENT_ONETOONE_IP #ifdef CLIENT_ONETOONE_IP
assoc = &list[i].assoc; assoc = &list[i].assoc;
if (1) {
#else #else
uint32_t a; uint32_t a;
for (a = 0; a < 2; a++) {
if (!a) for (a = 0, assoc = &list[i].assoc6; a < 2; a++, assoc = &list[i].assoc4)
assoc = &list[i].assoc6;
else
assoc = &list[i].assoc4;
#endif #endif
if (ipport_isset(&(assoc->ip_port)) && if (ipport_isset(&(assoc->ip_port)) &&
!is_timeout(temp_time, assoc->ret_timestamp, BAD_NODE_TIMEOUT)) { !is_timeout(temp_time, assoc->ret_timestamp, BAD_NODE_TIMEOUT)) {
@ -1027,7 +1023,6 @@ static void get_bunchnodes(DHT *dht, Client_data *list, uint16_t length, uint16_
if (num >= max_num) if (num >= max_num)
return; return;
} }
}
} }
} }
@ -1105,20 +1100,15 @@ int DHT_getfriendip(DHT *dht, uint8_t *client_id, IP_Port *ip_port)
IPPTsPng *assoc = NULL; IPPTsPng *assoc = NULL;
#ifdef CLIENT_ONETOONE_IP #ifdef CLIENT_ONETOONE_IP
assoc = &client->assoc; assoc = &client->assoc;
if (1) {
#else #else
uint32_t a; uint32_t a;
for (a = 0; a < 2; a++) {
if (!a) for (a = 0, assoc = &client->assoc6; a < 2; a++, assoc = &client->assoc4)
assoc = &client->assoc6;
else
assoc = &client->assoc4;
#endif #endif
if (!is_timeout(temp_time, assoc->timestamp, BAD_NODE_TIMEOUT)) { if (!is_timeout(temp_time, assoc->timestamp, BAD_NODE_TIMEOUT)) {
*ip_port = assoc->ip_port; *ip_port = assoc->ip_port;
return 1; return 1;
} }
}
} }
} }
@ -1145,14 +1135,10 @@ static void do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8
IPPTsPng *assoc; IPPTsPng *assoc;
#ifdef CLIENT_ONETOONE_IP #ifdef CLIENT_ONETOONE_IP
assoc = &client->assoc; assoc = &client->assoc;
if (1) {
#else #else
uint32_t a; uint32_t a;
for (a = 0; a < 2; a++) {
if (!a) for (a = 0, assoc = &client->assoc6; a < 2; a++, assoc = &client->assoc4)
assoc = &client->assoc6;
else
assoc = &client->assoc4;
#endif #endif
if (!is_timeout(temp_time, assoc->timestamp, KILL_NODE_TIMEOUT)) { if (!is_timeout(temp_time, assoc->timestamp, KILL_NODE_TIMEOUT)) {
@ -1168,7 +1154,6 @@ static void do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8
++num_nodes; ++num_nodes;
} }
} }
}
} }
if ((num_nodes != 0) && if ((num_nodes != 0) &&