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 'add2lists_forward' of https://github.com/FullName/ProjectTox-Core into FullName-add2lists_forward

Browse Source
This commit is contained in:
irungentoo 2013-11-07 17:39:10 -05:00
commit e1b215cfa9
2 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
toxcore/DHT.c
View File

@ -572,25 +572,26 @@ static void returnedip_ports(DHT *dht, IP_Port ip_port, uint8_t *client_id, uint
} }
} }
/* checks if ip/port or ping_id are already in the list to get nodes
* if both are set, both must match, otherwise the set must match
*
* returns 0 if neither is set or no match was found
* returns the (index + 1) of the match if one was found
*/
static int is_gettingnodes(DHT *dht, IP_Port ip_port, uint64_t ping_id) static int is_gettingnodes(DHT *dht, IP_Port ip_port, uint64_t ping_id)
{ {
uint8_t ip_valid = ip_isset(&ip_port.ip);
if (!ip_valid && !ping_id)
return 0;
uint32_t i; uint32_t i;
uint8_t pinging;
for (i = 0; i < LSEND_NODES_ARRAY; ++i ) { for (i = 0; i < LSEND_NODES_ARRAY; i++)
if (!is_timeout(dht->send_nodes[i].timestamp, PING_TIMEOUT)) { if (!is_timeout(dht->send_nodes[i].timestamp, PING_TIMEOUT))
pinging = 0; if (!ping_id || (dht->send_nodes[i].id == ping_id))
if (!ip_valid || ipport_equal(&dht->send_nodes[i].ip_port, &ip_port))
if (ping_id != 0 && dht->send_nodes[i].id == ping_id) return i + 1;
++pinging;
if (ip_isset(&ip_port.ip) && ipport_equal(&dht->send_nodes[i].ip_port, &ip_port))
++pinging;
if (pinging == (ping_id != 0) + ip_isset(&ip_port.ip))
return 1;
}
}
return 0; return 0;
} }
@ -841,10 +842,13 @@ static int handle_sendnodes_core(void *object, IP_Port source, uint8_t *packet,
memcpy(&ping_id, plain, sizeof(ping_id)); memcpy(&ping_id, plain, sizeof(ping_id));
if (!is_gettingnodes(dht, source, ping_id)) int send_nodes_index = is_gettingnodes(dht, source, ping_id);
if (!send_nodes_index)
return 1; return 1;
addto_lists(dht, source, packet + 1); /* store the address the *request* was sent to */
addto_lists(dht, dht->send_nodes[send_nodes_index - 1].ip_port, packet + 1);
*num_nodes_out = num_nodes; *num_nodes_out = num_nodes;

43
toxcore/ping.c
View File

@ -3,7 +3,7 @@
* *
* This file is donated to the Tox Project. * This file is donated to the Tox Project.
* Copyright 2013 plutooo * Copyright 2013 plutooo
* *
* Copyright (C) 2013 Tox project All Rights Reserved. * Copyright (C) 2013 Tox project All Rights Reserved.
* *
* This file is part of Tox. * This file is part of Tox.
@ -20,7 +20,7 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Tox. If not, see <http://www.gnu.org/licenses/>. * along with Tox. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -108,28 +108,35 @@ static uint64_t add_ping(PING *ping, IP_Port ipp) // O(n)
return ping->pings[p].id; return ping->pings[p].id;
} }
static bool is_pinging(PING *ping, IP_Port ipp, uint64_t ping_id) // O(n) TODO: Replace this with something else. /* checks if ip/port or ping_id are already in the list to ping
* if both are set, both must match, otherwise the set must match
*
* returns 0 if neither is set or no match was found
* returns the (index + 1) of the match if one was found
*/
static int is_pinging(PING *ping, IP_Port ipp, uint64_t ping_id)
{ {
// O(n) TODO: Replace this with something else.
/* shouldn't that be an OR ? */ /* at least one MUST be set */
if (!ip_isset(&ipp.ip) && ping_id == 0) uint8_t ip_valid = ip_isset(&ipp.ip);
return false;
size_t i, id; if (!ip_valid && !ping_id)
return 0;
size_t i;
remove_timeouts(ping); remove_timeouts(ping);
for (i = 0; i < ping->num_pings; i++) { for (i = 0; i < ping->num_pings; i++) {
id = (ping->pos_pings + i) % PING_NUM_MAX; size_t id = (ping->pos_pings + i) % PING_NUM_MAX;
/* ping_id = 0 means match any id. */ if (!ping_id || (ping->pings[id].id == ping_id))
if ((!ip_isset(&ipp.ip) || ipport_equal(&ping->pings[id].ip_port, &ipp)) && if (!ip_valid || ipport_equal(&ping->pings[id].ip_port, &ipp))
(ping->pings[id].id == ping_id || ping_id == 0)) { return id + 1;
return true;
}
} }
return false; return 0;
} }
#define DHT_PING_SIZE (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(uint64_t) + ENCRYPTION_PADDING) #define DHT_PING_SIZE (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(uint64_t) + ENCRYPTION_PADDING)
@ -246,11 +253,13 @@ static int handle_ping_response(void *_dht, IP_Port source, uint8_t *packet, uin
return 1; return 1;
/* Make sure ping_id is correct. */ /* Make sure ping_id is correct. */
if (!is_pinging(ping, source, ping_id)) int ping_index = is_pinging(ping, source, ping_id);
if (!ping_index)
return 1; return 1;
// Associate source ip with client_id /* Associate client_id with the ip the request was sent to */
addto_lists(dht, source, packet + 1); addto_lists(dht, ping->pings[ping_index - 1].ip_port, packet + 1);
return 0; return 0;
} }