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

DHT fix.

Browse Source 
Improve DHT distance function.
This commit is contained in:
irungentoo 2015-12-09 08:59:10 -05:00
parent 4a6837acc7
commit deb0b358a5
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
toxcore/DHT.c
View File

@ -75,12 +75,37 @@ int id_closest(const uint8_t *pk, const uint8_t *pk1, const uint8_t *pk2)
{
size_t i;
uint8_t distance1, distance2;
_Bool d1_abs = 0, d2_abs = 0;
for (i = 0; i < crypto_box_PUBLICKEYBYTES; ++i) {
distance1 = pk[i] ^ pk1[i];
distance2 = pk[i] ^ pk2[i];
if (!i) {
if (distance1 & (1 << 7)) {
d1_abs = 1;
}
if (distance2 & (1 << 7)) {
d2_abs = 1;
}
}
if (d1_abs)
distance1 = ~distance1;
if (d2_abs)
distance2 = ~distance2;
if (i == (crypto_box_PUBLICKEYBYTES - 1)) {
if (d1_abs)
++distance1;
if (d2_abs)
++distance2;
}
if (distance1 < distance2)
return 1;
@ -1402,9 +1427,9 @@ static uint8_t do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, co
if (rand_node >= num_nodes) {
rand_node = rand_node % num_nodes;
uint8_t get_pk[crypto_box_PUBLICKEYBYTES];
if (memcmp(client_list[rand_node]->public_key, public_key, crypto_box_PUBLICKEYBYTES) != 0) {
uint8_t get_pk[crypto_box_PUBLICKEYBYTES];
find_midpoint(get_pk, client_list[rand_node]->public_key, public_key);
getnodes(dht, assoc_list[rand_node]->ip_port, client_list[rand_node]->public_key, get_pk, NULL);
}