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

Allow 0 length sendnode.

Browse Source
This commit is contained in:
irungentoo 2015-12-17 14:05:35 -05:00
parent 0938ba08d9
commit 07b4b041fb
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toxcore/DHT.c
View File

@ -1079,18 +1079,19 @@ static int sendnodes_ipv6(const DHT *dht, IP_Port ip_port, const uint8_t *public
Node_format nodes_list[MAX_SENT_NODES]; Node_format nodes_list[MAX_SENT_NODES];
uint32_t num_nodes = get_close_nodes(dht, client_id, nodes_list, 0, LAN_ip(ip_port.ip) == 0, 1); uint32_t num_nodes = get_close_nodes(dht, client_id, nodes_list, 0, LAN_ip(ip_port.ip) == 0, 1);
if (num_nodes == 0)
return 0;
uint8_t plain[1 + Node_format_size * MAX_SENT_NODES + length]; uint8_t plain[1 + Node_format_size * MAX_SENT_NODES + length];
uint8_t encrypt[sizeof(plain) + crypto_box_MACBYTES]; uint8_t encrypt[sizeof(plain) + crypto_box_MACBYTES];
uint8_t nonce[crypto_box_NONCEBYTES]; uint8_t nonce[crypto_box_NONCEBYTES];
new_nonce(nonce); new_nonce(nonce);
int nodes_length = pack_nodes(plain + 1, Node_format_size * MAX_SENT_NODES, nodes_list, num_nodes); int nodes_length = 0;
if (nodes_length <= 0) if (num_nodes) {
return -1; nodes_length = pack_nodes(plain + 1, Node_format_size * MAX_SENT_NODES, nodes_list, num_nodes);
if (nodes_length <= 0)
return -1;
}
plain[0] = num_nodes; plain[0] = num_nodes;
memcpy(plain + 1 + nodes_length, sendback_data, length); memcpy(plain + 1 + nodes_length, sendback_data, length);
@ -1176,7 +1177,7 @@ static int handle_sendnodes_core(void *object, IP_Port source, const uint8_t *pa
DHT *dht = object; DHT *dht = object;
uint32_t cid_size = 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES + 1 + sizeof(uint64_t) + crypto_box_MACBYTES; uint32_t cid_size = 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES + 1 + sizeof(uint64_t) + crypto_box_MACBYTES;
if (length <= cid_size) /* too short */ if (length < cid_size) /* too short */
return 1; return 1;
uint32_t data_size = length - cid_size; uint32_t data_size = length - cid_size;
@ -1200,7 +1201,7 @@ static int handle_sendnodes_core(void *object, IP_Port source, const uint8_t *pa
if ((unsigned int)len != sizeof(plain)) if ((unsigned int)len != sizeof(plain))
return 1; return 1;
if (plain[0] > size_plain_nodes || plain[0] == 0) if (plain[0] > size_plain_nodes)
return 1; return 1;
Node_format sendback_node; Node_format sendback_node;
@ -1220,7 +1221,7 @@ static int handle_sendnodes_core(void *object, IP_Port source, const uint8_t *pa
if (num_nodes != plain[0]) if (num_nodes != plain[0])
return 1; return 1;
if (num_nodes <= 0) if (num_nodes < 0)
return 1; return 1;
/* store the address the *request* was sent to */ /* store the address the *request* was sent to */