diff options
Diffstat (limited to 'toxcore/ping.c')
-rw-r--r-- | toxcore/ping.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/toxcore/ping.c b/toxcore/ping.c index f2f56013..1e5892eb 100644 --- a/toxcore/ping.c +++ b/toxcore/ping.c | |||
@@ -64,7 +64,7 @@ int32_t ping_send_request(Ping *ping, IP_Port ipp, const uint8_t *public_key) | |||
64 | int rc; | 64 | int rc; |
65 | uint64_t ping_id; | 65 | uint64_t ping_id; |
66 | 66 | ||
67 | if (id_equal(public_key, ping->dht->self_public_key)) { | 67 | if (id_equal(public_key, dht_get_self_public_key(ping->dht))) { |
68 | return 1; | 68 | return 1; |
69 | } | 69 | } |
70 | 70 | ||
@@ -87,7 +87,7 @@ int32_t ping_send_request(Ping *ping, IP_Port ipp, const uint8_t *public_key) | |||
87 | memcpy(ping_plain + 1, &ping_id, sizeof(ping_id)); | 87 | memcpy(ping_plain + 1, &ping_id, sizeof(ping_id)); |
88 | 88 | ||
89 | pk[0] = NET_PACKET_PING_REQUEST; | 89 | pk[0] = NET_PACKET_PING_REQUEST; |
90 | id_copy(pk + 1, ping->dht->self_public_key); // Our pubkey | 90 | id_copy(pk + 1, dht_get_self_public_key(ping->dht)); // Our pubkey |
91 | random_nonce(pk + 1 + CRYPTO_PUBLIC_KEY_SIZE); // Generate new nonce | 91 | random_nonce(pk + 1 + CRYPTO_PUBLIC_KEY_SIZE); // Generate new nonce |
92 | 92 | ||
93 | 93 | ||
@@ -100,7 +100,7 @@ int32_t ping_send_request(Ping *ping, IP_Port ipp, const uint8_t *public_key) | |||
100 | return 1; | 100 | return 1; |
101 | } | 101 | } |
102 | 102 | ||
103 | return sendpacket(ping->dht->net, ipp, pk, sizeof(pk)); | 103 | return sendpacket(dht_get_net(ping->dht), ipp, pk, sizeof(pk)); |
104 | } | 104 | } |
105 | 105 | ||
106 | static int ping_send_response(Ping *ping, IP_Port ipp, const uint8_t *public_key, uint64_t ping_id, | 106 | static int ping_send_response(Ping *ping, IP_Port ipp, const uint8_t *public_key, uint64_t ping_id, |
@@ -109,7 +109,7 @@ static int ping_send_response(Ping *ping, IP_Port ipp, const uint8_t *public_key | |||
109 | uint8_t pk[DHT_PING_SIZE]; | 109 | uint8_t pk[DHT_PING_SIZE]; |
110 | int rc; | 110 | int rc; |
111 | 111 | ||
112 | if (id_equal(public_key, ping->dht->self_public_key)) { | 112 | if (id_equal(public_key, dht_get_self_public_key(ping->dht))) { |
113 | return 1; | 113 | return 1; |
114 | } | 114 | } |
115 | 115 | ||
@@ -118,7 +118,7 @@ static int ping_send_response(Ping *ping, IP_Port ipp, const uint8_t *public_key | |||
118 | memcpy(ping_plain + 1, &ping_id, sizeof(ping_id)); | 118 | memcpy(ping_plain + 1, &ping_id, sizeof(ping_id)); |
119 | 119 | ||
120 | pk[0] = NET_PACKET_PING_RESPONSE; | 120 | pk[0] = NET_PACKET_PING_RESPONSE; |
121 | id_copy(pk + 1, ping->dht->self_public_key); // Our pubkey | 121 | id_copy(pk + 1, dht_get_self_public_key(ping->dht)); // Our pubkey |
122 | random_nonce(pk + 1 + CRYPTO_PUBLIC_KEY_SIZE); // Generate new nonce | 122 | random_nonce(pk + 1 + CRYPTO_PUBLIC_KEY_SIZE); // Generate new nonce |
123 | 123 | ||
124 | // Encrypt ping_id using recipient privkey | 124 | // Encrypt ping_id using recipient privkey |
@@ -131,7 +131,7 @@ static int ping_send_response(Ping *ping, IP_Port ipp, const uint8_t *public_key | |||
131 | return 1; | 131 | return 1; |
132 | } | 132 | } |
133 | 133 | ||
134 | return sendpacket(ping->dht->net, ipp, pk, sizeof(pk)); | 134 | return sendpacket(dht_get_net(ping->dht), ipp, pk, sizeof(pk)); |
135 | } | 135 | } |
136 | 136 | ||
137 | static int handle_ping_request(void *object, IP_Port source, const uint8_t *packet, uint16_t length, void *userdata) | 137 | static int handle_ping_request(void *object, IP_Port source, const uint8_t *packet, uint16_t length, void *userdata) |
@@ -143,9 +143,9 @@ static int handle_ping_request(void *object, IP_Port source, const uint8_t *pack | |||
143 | return 1; | 143 | return 1; |
144 | } | 144 | } |
145 | 145 | ||
146 | Ping *ping = dht->ping; | 146 | Ping *ping = dht_get_ping(dht); |
147 | 147 | ||
148 | if (id_equal(packet + 1, ping->dht->self_public_key)) { | 148 | if (id_equal(packet + 1, dht_get_self_public_key(ping->dht))) { |
149 | return 1; | 149 | return 1; |
150 | } | 150 | } |
151 | 151 | ||
@@ -186,9 +186,9 @@ static int handle_ping_response(void *object, IP_Port source, const uint8_t *pac | |||
186 | return 1; | 186 | return 1; |
187 | } | 187 | } |
188 | 188 | ||
189 | Ping *ping = dht->ping; | 189 | Ping *ping = dht_get_ping(dht); |
190 | 190 | ||
191 | if (id_equal(packet + 1, ping->dht->self_public_key)) { | 191 | if (id_equal(packet + 1, dht_get_self_public_key(ping->dht))) { |
192 | return 1; | 192 | return 1; |
193 | } | 193 | } |
194 | 194 | ||
@@ -284,7 +284,7 @@ int32_t ping_add(Ping *ping, const uint8_t *public_key, IP_Port ip_port) | |||
284 | return -1; | 284 | return -1; |
285 | } | 285 | } |
286 | 286 | ||
287 | if (in_list(ping->dht->close_clientlist, LCLIENT_LIST, public_key, ip_port)) { | 287 | if (in_list(dht_get_close_clientlist(ping->dht), LCLIENT_LIST, public_key, ip_port)) { |
288 | return -1; | 288 | return -1; |
289 | } | 289 | } |
290 | 290 | ||
@@ -309,7 +309,7 @@ int32_t ping_add(Ping *ping, const uint8_t *public_key, IP_Port ip_port) | |||
309 | } | 309 | } |
310 | } | 310 | } |
311 | 311 | ||
312 | if (add_to_list(ping->to_ping, MAX_TO_PING, public_key, ip_port, ping->dht->self_public_key)) { | 312 | if (add_to_list(ping->to_ping, MAX_TO_PING, public_key, ip_port, dht_get_self_public_key(ping->dht))) { |
313 | return 0; | 313 | return 0; |
314 | } | 314 | } |
315 | 315 | ||
@@ -367,16 +367,16 @@ Ping *ping_new(DHT *dht) | |||
367 | } | 367 | } |
368 | 368 | ||
369 | ping->dht = dht; | 369 | ping->dht = dht; |
370 | networking_registerhandler(ping->dht->net, NET_PACKET_PING_REQUEST, &handle_ping_request, dht); | 370 | networking_registerhandler(dht_get_net(ping->dht), NET_PACKET_PING_REQUEST, &handle_ping_request, dht); |
371 | networking_registerhandler(ping->dht->net, NET_PACKET_PING_RESPONSE, &handle_ping_response, dht); | 371 | networking_registerhandler(dht_get_net(ping->dht), NET_PACKET_PING_RESPONSE, &handle_ping_response, dht); |
372 | 372 | ||
373 | return ping; | 373 | return ping; |
374 | } | 374 | } |
375 | 375 | ||
376 | void ping_kill(Ping *ping) | 376 | void ping_kill(Ping *ping) |
377 | { | 377 | { |
378 | networking_registerhandler(ping->dht->net, NET_PACKET_PING_REQUEST, NULL, NULL); | 378 | networking_registerhandler(dht_get_net(ping->dht), NET_PACKET_PING_REQUEST, NULL, NULL); |
379 | networking_registerhandler(ping->dht->net, NET_PACKET_PING_RESPONSE, NULL, NULL); | 379 | networking_registerhandler(dht_get_net(ping->dht), NET_PACKET_PING_RESPONSE, NULL, NULL); |
380 | ping_array_kill(ping->ping_array); | 380 | ping_array_kill(ping->ping_array); |
381 | 381 | ||
382 | free(ping); | 382 | free(ping); |