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

LAN ips can be sent to LAN ips.

Browse Source
This commit is contained in:
irungentoo 2013-09-28 09:54:17 -04:00
parent ed07194eb6
commit 92f89b9384
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toxcore/DHT.c
View File

@ -310,7 +310,7 @@ static int friend_number(DHT *dht, uint8_t *client_id)
*/ */
static void get_close_nodes_inner(DHT *dht, uint8_t *client_id, Node_format *nodes_list, static void get_close_nodes_inner(DHT *dht, uint8_t *client_id, Node_format *nodes_list,
sa_family_t sa_family, Client_data *client_list, uint32_t client_list_length, sa_family_t sa_family, Client_data *client_list, uint32_t client_list_length,
time_t timestamp, int *num_nodes_ptr) time_t timestamp, int *num_nodes_ptr, uint8_t is_LAN)
{ {
if ((sa_family != AF_INET) && (sa_family != AF_INET6)) if ((sa_family != AF_INET) && (sa_family != AF_INET6))
return; return;
@ -370,7 +370,7 @@ static void get_close_nodes_inner(DHT *dht, uint8_t *client_id, Node_format *nod
if (ipv46x) if (ipv46x)
continue; continue;
if (!LAN_ip(ipptp->ip_port.ip)) if (!LAN_ip(ipptp->ip_port.ip) && !is_LAN)
continue; continue;
if (num_nodes < MAX_SENT_NODES) { if (num_nodes < MAX_SENT_NODES) {
@ -412,17 +412,17 @@ static void get_close_nodes_inner(DHT *dht, uint8_t *client_id, Node_format *nod
* TODO: For the love of based <your favorite deity, in doubt use "love"> make * TODO: For the love of based <your favorite deity, in doubt use "love"> make
* this function cleaner and much more efficient. * this function cleaner and much more efficient.
*/ */
static int get_close_nodes(DHT *dht, uint8_t *client_id, Node_format *nodes_list, sa_family_t sa_family) static int get_close_nodes(DHT *dht, uint8_t *client_id, Node_format *nodes_list, sa_family_t sa_family, uint8_t is_LAN)
{ {
time_t timestamp = unix_time(); time_t timestamp = unix_time();
int num_nodes = 0, i; int num_nodes = 0, i;
get_close_nodes_inner(dht, client_id, nodes_list, sa_family, get_close_nodes_inner(dht, client_id, nodes_list, sa_family,
dht->close_clientlist, LCLIENT_LIST, timestamp, &num_nodes); dht->close_clientlist, LCLIENT_LIST, timestamp, &num_nodes, is_LAN);
for (i = 0; i < dht->num_friends; ++i) for (i = 0; i < dht->num_friends; ++i)
get_close_nodes_inner(dht, client_id, nodes_list, sa_family, get_close_nodes_inner(dht, client_id, nodes_list, sa_family,
dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS, dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS,
timestamp, &num_nodes); timestamp, &num_nodes, is_LAN);
return num_nodes; return num_nodes;
} }
@ -827,7 +827,7 @@ static int sendnodes(DHT *dht, IP_Port ip_port, uint8_t *public_key, uint8_t *cl
+ Node4_format_size * MAX_SENT_NODES + ENCRYPTION_PADDING]; + Node4_format_size * MAX_SENT_NODES + ENCRYPTION_PADDING];
Node_format nodes_list[MAX_SENT_NODES]; Node_format nodes_list[MAX_SENT_NODES];
int num_nodes = get_close_nodes(dht, client_id, nodes_list, AF_INET); int num_nodes = get_close_nodes(dht, client_id, nodes_list, AF_INET, LAN_ip(ip_port.ip) == 0);
if (num_nodes == 0) if (num_nodes == 0)
return 0; return 0;
@ -902,7 +902,7 @@ static int sendnodes_ipv6(DHT *dht, IP_Port ip_port, uint8_t *public_key, uint8_
+ Node_format_size * MAX_SENT_NODES + ENCRYPTION_PADDING]; + Node_format_size * MAX_SENT_NODES + ENCRYPTION_PADDING];
Node_format nodes_list[MAX_SENT_NODES]; Node_format nodes_list[MAX_SENT_NODES];
int num_nodes = get_close_nodes(dht, client_id, nodes_list, AF_INET6); int num_nodes = get_close_nodes(dht, client_id, nodes_list, AF_INET6, LAN_ip(ip_port.ip) == 0);
if (num_nodes == 0) if (num_nodes == 0)
return 0; return 0;