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

Speeded up onion requests.

Browse Source 
Also increased the maximum number of announce entries.
This commit is contained in:
irungentoo 2014-03-07 16:31:13 -05:00
parent d058a59ccf
commit 48d757f468
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toxcore/onion_announce.h
View File

@ -25,7 +25,7 @@
#include "onion.h" #include "onion.h"
#define ONION_ANNOUNCE_MAX_ENTRIES 32 #define ONION_ANNOUNCE_MAX_ENTRIES 48
#define ONION_ANNOUNCE_TIMEOUT 300 #define ONION_ANNOUNCE_TIMEOUT 300
#define ONION_PING_ID_SIZE crypto_hash_sha256_BYTES #define ONION_PING_ID_SIZE crypto_hash_sha256_BYTES

29
toxcore/onion_client.c
View File

@ -519,7 +519,8 @@ int send_onion_data(Onion_Client *onion_c, int friend_num, uint8_t *data, uint32
if ((uint32_t)len + crypto_box_PUBLICKEYBYTES != sizeof(packet)) if ((uint32_t)len + crypto_box_PUBLICKEYBYTES != sizeof(packet))
return -1; return -1;
uint32_t i, good = 0; uint32_t i, good_nodes[MAX_ONION_CLIENTS], num_good = 0;
Onion_Path path[MAX_ONION_CLIENTS];
Onion_Node *list_nodes = onion_c->friends_list[friend_num].clients_list; Onion_Node *list_nodes = onion_c->friends_list[friend_num].clients_list;
for (i = 0; i < MAX_ONION_CLIENTS; ++i) { for (i = 0; i < MAX_ONION_CLIENTS; ++i) {
@ -527,22 +528,26 @@ int send_onion_data(Onion_Client *onion_c, int friend_num, uint8_t *data, uint32
continue; continue;
if (list_nodes[i].is_stored) { if (list_nodes[i].is_stored) {
Node_format nodes[4]; if (random_path(onion_c->dht, &onion_c->friends_list[friend_num].onion_paths, ~0, &path[num_good]) == -1)
Onion_Path path;
if (random_path(onion_c->dht, &onion_c->friends_list[friend_num].onion_paths, ~0, &path) == -1)
continue; continue;
memcpy(nodes[3].client_id, list_nodes[i].client_id, crypto_box_PUBLICKEYBYTES); good_nodes[num_good] = i;
nodes[3].ip_port = list_nodes[i].ip_port; ++num_good;
if (send_data_request(onion_c->net, &path, list_nodes[i].ip_port, onion_c->friends_list[friend_num].real_client_id,
list_nodes[i].data_public_key, nonce, packet, sizeof(packet)) == 0)
++good;
} }
} }
if (num_good < (MAX_ONION_CLIENTS / 4) + 1)
return -1;
uint32_t good = 0;
for (i = 0; i < num_good; ++i) {
if (send_data_request(onion_c->net, &path[i], list_nodes[good_nodes[i]].ip_port,
onion_c->friends_list[friend_num].real_client_id, list_nodes[good_nodes[i]].data_public_key, nonce, packet,
sizeof(packet)) == 0)
++good;
}
return good; return good;
} }