summaryrefslogtreecommitdiff
path: root/toxcore/DHT.c
diff options
context:
space:
mode:
Diffstat (limited to 'toxcore/DHT.c')
-rw-r--r--toxcore/DHT.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 141ae533..4e089180 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -1285,7 +1285,7 @@ static int handle_getnodes(void *object, IP_Port source, const uint8_t *packet,
1285 1285
1286 sendnodes_ipv6(dht, source, packet + 1, plain, plain + CRYPTO_PUBLIC_KEY_SIZE, sizeof(uint64_t), shared_key); 1286 sendnodes_ipv6(dht, source, packet + 1, plain, plain + CRYPTO_PUBLIC_KEY_SIZE, sizeof(uint64_t), shared_key);
1287 1287
1288 add_to_ping(dht->ping, packet + 1, source); 1288 ping_add(dht->ping, packet + 1, source);
1289 1289
1290 return 0; 1290 return 0;
1291} 1291}
@@ -2069,7 +2069,7 @@ static void punch_holes(DHT *dht, IP ip, uint16_t *port_list, uint16_t numports,
2069 IP_Port pinging; 2069 IP_Port pinging;
2070 ip_copy(&pinging.ip, &ip); 2070 ip_copy(&pinging.ip, &ip);
2071 pinging.port = net_htons(first_port); 2071 pinging.port = net_htons(first_port);
2072 send_ping_request(dht->ping, pinging, dht->friends_list[friend_num].public_key); 2072 ping_send_request(dht->ping, pinging, dht->friends_list[friend_num].public_key);
2073 } else { 2073 } else {
2074 for (i = 0; i < MAX_PUNCHING_PORTS; ++i) { 2074 for (i = 0; i < MAX_PUNCHING_PORTS; ++i) {
2075 /* TODO(irungentoo): Improve port guessing algorithm. */ 2075 /* TODO(irungentoo): Improve port guessing algorithm. */
@@ -2081,7 +2081,7 @@ static void punch_holes(DHT *dht, IP ip, uint16_t *port_list, uint16_t numports,
2081 IP_Port pinging; 2081 IP_Port pinging;
2082 ip_copy(&pinging.ip, &ip); 2082 ip_copy(&pinging.ip, &ip);
2083 pinging.port = net_htons(port); 2083 pinging.port = net_htons(port);
2084 send_ping_request(dht->ping, pinging, dht->friends_list[friend_num].public_key); 2084 ping_send_request(dht->ping, pinging, dht->friends_list[friend_num].public_key);
2085 } 2085 }
2086 2086
2087 dht->friends_list[friend_num].nat.punching_index += i; 2087 dht->friends_list[friend_num].nat.punching_index += i;
@@ -2095,7 +2095,7 @@ static void punch_holes(DHT *dht, IP ip, uint16_t *port_list, uint16_t numports,
2095 for (i = 0; i < MAX_PUNCHING_PORTS; ++i) { 2095 for (i = 0; i < MAX_PUNCHING_PORTS; ++i) {
2096 uint32_t it = i + dht->friends_list[friend_num].nat.punching_index2; 2096 uint32_t it = i + dht->friends_list[friend_num].nat.punching_index2;
2097 pinging.port = net_htons(port + it); 2097 pinging.port = net_htons(port + it);
2098 send_ping_request(dht->ping, pinging, dht->friends_list[friend_num].public_key); 2098 ping_send_request(dht->ping, pinging, dht->friends_list[friend_num].public_key);
2099 } 2099 }
2100 2100
2101 dht->friends_list[friend_num].nat.punching_index2 += i - (MAX_PUNCHING_PORTS / 2); 2101 dht->friends_list[friend_num].nat.punching_index2 += i - (MAX_PUNCHING_PORTS / 2);
@@ -2562,7 +2562,7 @@ DHT *new_DHT(Logger *log, Networking_Core *net, bool holepunching_enabled)
2562 2562
2563 dht->hole_punching_enabled = holepunching_enabled; 2563 dht->hole_punching_enabled = holepunching_enabled;
2564 2564
2565 dht->ping = new_ping(dht); 2565 dht->ping = ping_new(dht);
2566 2566
2567 if (dht->ping == NULL) { 2567 if (dht->ping == NULL) {
2568 kill_DHT(dht); 2568 kill_DHT(dht);
@@ -2610,7 +2610,7 @@ void do_DHT(DHT *dht)
2610 do_Close(dht); 2610 do_Close(dht);
2611 do_DHT_friends(dht); 2611 do_DHT_friends(dht);
2612 do_NAT(dht); 2612 do_NAT(dht);
2613 do_to_ping(dht->ping); 2613 ping_iterate(dht->ping);
2614#if DHT_HARDENING 2614#if DHT_HARDENING
2615 do_hardening(dht); 2615 do_hardening(dht);
2616#endif 2616#endif
@@ -2624,7 +2624,7 @@ void kill_DHT(DHT *dht)
2624 cryptopacket_registerhandler(dht, CRYPTO_PACKET_HARDENING, NULL, NULL); 2624 cryptopacket_registerhandler(dht, CRYPTO_PACKET_HARDENING, NULL, NULL);
2625 ping_array_kill(dht->dht_ping_array); 2625 ping_array_kill(dht->dht_ping_array);
2626 ping_array_kill(dht->dht_harden_ping_array); 2626 ping_array_kill(dht->dht_harden_ping_array);
2627 kill_ping(dht->ping); 2627 ping_kill(dht->ping);
2628 free(dht->friends_list); 2628 free(dht->friends_list);
2629 free(dht->loaded_nodes_list); 2629 free(dht->loaded_nodes_list);
2630 free(dht); 2630 free(dht);