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

check if already in close list in ping_node_from_getnodes_ok()

Browse Source 
fix index bounds check in add_to_close() and is_pk_in_close_list()

add TODO to write test for bug which fixed by this commit
This commit is contained in:
zugz 2017-03-12 11:09:24 +01:00 committed by Robin Lindén
parent f6db9333e2
commit 2474f43087
No known key found for this signature in database
GPG Key ID: 601A604B7E605776
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
toxcore/DHT.c
View File

@ -954,11 +954,13 @@ static int add_to_close(DHT *dht, const uint8_t *public_key, IP_Port ip_port, bo
unsigned int index = bit_by_bit_cmp(public_key, dht->self_public_key); unsigned int index = bit_by_bit_cmp(public_key, dht->self_public_key);
if (index > LCLIENT_LENGTH) { if (index >= LCLIENT_LENGTH) {
index = LCLIENT_LENGTH - 1; index = LCLIENT_LENGTH - 1;
} }
for (i = 0; i < LCLIENT_NODES; ++i) { for (i = 0; i < LCLIENT_NODES; ++i) {
/* TODO(iphydf): write bounds checking test to catch the case that
* index is left as >= LCLIENT_LENGTH */
Client_data *client = &dht->close_clientlist[(index * LCLIENT_NODES) + i]; Client_data *client = &dht->close_clientlist[(index * LCLIENT_NODES) + i];
if (is_timeout(client->assoc4.timestamp, BAD_NODE_TIMEOUT) && is_timeout(client->assoc6.timestamp, BAD_NODE_TIMEOUT)) { if (is_timeout(client->assoc4.timestamp, BAD_NODE_TIMEOUT) && is_timeout(client->assoc6.timestamp, BAD_NODE_TIMEOUT)) {
@ -1021,6 +1023,17 @@ static bool is_pk_in_client_list(Client_data *list, unsigned int client_list_len
return 0; return 0;
} }
static bool is_pk_in_close_list(DHT *dht, const uint8_t *public_key, IP_Port ip_port)
{
unsigned int index = bit_by_bit_cmp(public_key, dht->self_public_key);
if (index >= LCLIENT_LENGTH) {
index = LCLIENT_LENGTH - 1;
}
return is_pk_in_client_list(dht->close_clientlist + index * LCLIENT_NODES, LCLIENT_NODES, public_key, ip_port);
}
/* Check if the node obtained with a get_nodes with public_key should be pinged. /* Check if the node obtained with a get_nodes with public_key should be pinged.
* NOTE: for best results call it after addto_lists; * NOTE: for best results call it after addto_lists;
* *
@ -1035,7 +1048,8 @@ static unsigned int ping_node_from_getnodes_ok(DHT *dht, const uint8_t *public_k
ret = 1; ret = 1;
} }
if (ret && !client_in_nodelist(dht->to_bootstrap, dht->num_to_bootstrap, public_key)) { if (ret && !client_in_nodelist(dht->to_bootstrap, dht->num_to_bootstrap, public_key)
&& !is_pk_in_close_list(dht, public_key, ip_port)) {
if (dht->num_to_bootstrap < MAX_CLOSE_TO_BOOTSTRAP_NODES) { if (dht->num_to_bootstrap < MAX_CLOSE_TO_BOOTSTRAP_NODES) {
memcpy(dht->to_bootstrap[dht->num_to_bootstrap].public_key, public_key, CRYPTO_PUBLIC_KEY_SIZE); memcpy(dht->to_bootstrap[dht->num_to_bootstrap].public_key, public_key, CRYPTO_PUBLIC_KEY_SIZE);
dht->to_bootstrap[dht->num_to_bootstrap].ip_port = ip_port; dht->to_bootstrap[dht->num_to_bootstrap].ip_port = ip_port;