8 files changed, 61 insertions, 113 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index d28c1ecf..deb71864 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -164,12 +164,17 @@ void to_net_family(IP *ip)
         ip->family = TOX_AF_INET6;
 }
 
-void to_host_family(IP *ip)
+int to_host_family(IP *ip)
 {
-    if (ip->family == TOX_AF_INET)
+    if (ip->family == TOX_AF_INET) {
         ip->family = AF_INET;
-    else if (ip->family == TOX_AF_INET6)
+        return 0;
+    } else if (ip->family == TOX_AF_INET6) {
         ip->family = AF_INET6;
+        return 0;
+    } else {
+        return -1;
+    }
 }
 
 /* Pack number of nodes into data of maxlength length.
@@ -2082,82 +2087,6 @@ uint16_t closelist_nodes(DHT *dht, Node_format *nodes, uint16_t max_num)
     return count;
 }
 
-/* Put a random node from list of list_size in node. LAN_ok is 1 if LAN ips are ok, 0 if we don't want them. */
-static int random_node_fromlist(Client_data *list, uint16_t list_size, Node_format *node, uint8_t LAN_ok)
-{
-    uint32_t i;
-    uint32_t num_nodes = 0;
-    Client_data *client_list[list_size * 2];
-    IPPTsPng    *assoc_list[list_size * 2];
-
-    for (i = 0; i < list_size; i++) {
-        /* If node is not dead. */
-        Client_data *client = &list[i];
-        IPPTsPng *assoc;
-        uint32_t a;
-
-        for (a = 0, assoc = &client->assoc6; a < 2; a++, assoc = &client->assoc4) {
-            /* If node is good. */
-            if (!is_timeout(assoc->timestamp, BAD_NODE_TIMEOUT)) {
-                if (!LAN_ok) {
-                    if (LAN_ip(assoc->ip_port.ip) == 0)
-                        continue;
-                }
-
-                client_list[num_nodes] = client;
-                assoc_list[num_nodes] = assoc;
-                ++num_nodes;
-            }
-        }
-    }
-
-    if (num_nodes == 0)
-        return -1;
-
-    uint32_t rand_node = rand() % num_nodes;
-    node->ip_port = assoc_list[rand_node]->ip_port;
-    memcpy(node->client_id, client_list[rand_node]->client_id, CLIENT_ID_SIZE);
-    return 0;
-}
-
-/* Put up to max_num random nodes in nodes.
- *
- * return the number of nodes.
- *
- * NOTE:this is used to pick nodes for paths.
- *
- * TODO: remove the LAN stuff from this.
- */
-uint16_t random_nodes_path(const DHT *dht, Node_format *nodes, uint16_t max_num)
-{
-    if (max_num == 0)
-        return 0;
-
-    if (dht->num_friends == 0)
-        return 0;
-
-    uint16_t count = 0;
-    uint16_t list_size = 0;
-    uint32_t i;
-
-    for (i = 0; i < max_num; ++i) {
-        Client_data *list = NULL;
-        uint16_t rand_num = rand() % (dht->num_friends);
-        list = dht->friends_list[rand_num].client_list;
-        list_size = MAX_FRIEND_CLIENTS;
-
-        uint8_t LAN_ok = 1;
-
-        if (count != 0 && LAN_ip(nodes[0].ip_port.ip) != 0)
-            LAN_ok = 0;
-
-        if (random_node_fromlist(list, list_size, &nodes[count], LAN_ok) == 0)
-            ++count;
-    }
-
-    return count;
-}
-
 void do_hardening(DHT *dht)
 {
     uint32_t i;
@@ -2331,7 +2260,6 @@ void kill_DHT(DHT *dht)
     kill_Assoc(dht->assoc);
 #endif
     networking_registerhandler(dht->net, NET_PACKET_GET_NODES, NULL, NULL);
-    networking_registerhandler(dht->net, NET_PACKET_SEND_NODES, NULL, NULL);
     networking_registerhandler(dht->net, NET_PACKET_SEND_NODES_IPV6, NULL, NULL);
     cryptopacket_registerhandler(dht, CRYPTO_PACKET_NAT_PING, NULL, NULL);
     cryptopacket_registerhandler(dht, CRYPTO_PACKET_HARDENING, NULL, NULL);
diff --git a/toxcore/DHT.h b/toxcore/DHT.h
index 35000c87..547f3887 100644
--- a/toxcore/DHT.h
+++ b/toxcore/DHT.h
@@ -65,7 +65,9 @@
 
 /* Functions to transfer ips safely across wire. */
 void to_net_family(IP *ip);
-void to_host_family(IP *ip);
+
+/* return 0 on success, -1 on failure. */
+int to_host_family(IP *ip);
 
 typedef struct {
     IP_Port     ip_port;
@@ -324,14 +326,6 @@ int get_close_nodes(const DHT *dht, const uint8_t *client_id, Node_format *nodes
  */
 uint16_t closelist_nodes(DHT *dht, Node_format *nodes, uint16_t max_num);
 
-/* Put up to max_num random nodes in nodes.
- *
- * return the number of nodes.
- *
- * NOTE:this is used to pick nodes for paths.
- */
-uint16_t random_nodes_path(const DHT *dht, Node_format *nodes, uint16_t max_num);
-
 /* Run this function at least a couple times per second (It's the main loop). */
 void do_DHT(DHT *dht);
 
diff --git a/toxcore/crypto_core.h b/toxcore/crypto_core.h
index fb66e724..58bdc2f3 100644
--- a/toxcore/crypto_core.h
+++ b/toxcore/crypto_core.h
@@ -123,9 +123,6 @@ void new_nonce(uint8_t *nonce);
 #define CRYPTO_PACKET_FRIEND_REQ    32  /* Friend request crypto packet ID. */
 #define CRYPTO_PACKET_HARDENING     48  /* Hardening crypto packet ID. */
 #define CRYPTO_PACKET_NAT_PING      254 /* NAT ping crypto packet ID. */
-#define CRYPTO_PACKET_GROUP_CHAT_GET_NODES      48 /* Group chat get Nodes packet */
-#define CRYPTO_PACKET_GROUP_CHAT_SEND_NODES     49 /* Group chat send Nodes packet */
-#define CRYPTO_PACKET_GROUP_CHAT_BROADCAST      50 /* Group chat broadcast packet */
 
 /* Create a request to peer.
  * send_public_key and send_secret_key are the pub/secret keys of the sender.
diff --git a/toxcore/network.c b/toxcore/network.c
index 5539de6b..7a528f4f 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -763,10 +763,15 @@ void ip_pack(uint8_t *data, const IP *source)
     memcpy(data + 1, &source->ip6, SIZE_IP6);
 }
 
-void ip_unpack(IP *target, const uint8_t *data)
+/* return 0 on success, -1 on failure. */
+int ip_unpack(IP *target, const uint8_t *data, unsigned int data_size)
 {
+    if (data_size < (1 + SIZE_IP6))
+        return -1;
+
     target->family = data[0];
     memcpy(&target->ip6, data + 1, SIZE_IP6);
+    return 0;
 }
 
 void ipport_pack(uint8_t *data, const IP_Port *source)
@@ -775,10 +780,15 @@ void ipport_pack(uint8_t *data, const IP_Port *source)
     memcpy(data + SIZE_IP, &source->port, SIZE_PORT);
 }
 
-void ipport_unpack(IP_Port *target, const uint8_t *data)
+/* return 0 on success, -1 on failure. */
+int ipport_unpack(IP_Port *target, const uint8_t *data, unsigned int data_size)
 {
-    ip_unpack(&target->ip, data);
+    if (data_size < (SIZE_IP + SIZE_PORT))
+        return -1;
+
+    ip_unpack(&target->ip, data, data_size);
     memcpy(&target->port, data + SIZE_IP, SIZE_PORT);
+    return 0;
 }
 
 /* ip_ntoa
diff --git a/toxcore/network.h b/toxcore/network.h
index 5f9af490..49d51d20 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -97,7 +97,6 @@ typedef int sock_t;
 #define NET_PACKET_PING_REQUEST    0   /* Ping request packet ID. */
 #define NET_PACKET_PING_RESPONSE   1   /* Ping response packet ID. */
 #define NET_PACKET_GET_NODES       2   /* Get nodes request packet ID. */
-#define NET_PACKET_SEND_NODES      3   /* Send nodes response packet ID for IPv4 addresses. */
 #define NET_PACKET_SEND_NODES_IPV6 4   /* Send nodes response packet ID for other addresses. */
 #define NET_PACKET_COOKIE_REQUEST  24  /* Cookie request packet */
 #define NET_PACKET_COOKIE_RESPONSE 25  /* Cookie response packet */
@@ -250,12 +249,14 @@ void ipport_copy(IP_Port *target, const IP_Port *source);
 
 /* packs IP into data, writes SIZE_IP bytes to data */
 void ip_pack(uint8_t *data, const IP *source);
-/* unpacks IP from data, reads SIZE_IP bytes from data */
-void ip_unpack(IP *target, const uint8_t *data);
+/* unpacks IP from data, reads SIZE_IP bytes from data
+   return 0 on success, -1 on failure. */
+int ip_unpack(IP *target, const uint8_t *data, unsigned int data_size);
 /* packs IP_Port into data, writes SIZE_IPPORT bytes to data */
 void ipport_pack(uint8_t *data, const IP_Port *source);
-/* unpacks IP_Port from data, reads SIZE_IPPORT bytes to data */
-void ipport_unpack(IP_Port *target, const uint8_t *data);
+/* unpacks IP_Port from data, reads SIZE_IPPORT bytes to data
+   return 0 on success, -1 on failure. */
+int ipport_unpack(IP_Port *target, const uint8_t *data, unsigned int data_size);
 
 /*
  * addr_resolve():
diff --git a/toxcore/onion.c b/toxcore/onion.c
index 0982a2b0..b444e02a 100644
--- a/toxcore/onion.c
+++ b/toxcore/onion.c
@@ -293,8 +293,12 @@ int onion_send_1(const Onion *onion, const uint8_t *plain, uint16_t len, IP_Port
         return 1;
 
     IP_Port send_to;
-    ipport_unpack(&send_to, plain);
-    to_host_family(&send_to.ip);
+
+    if (ipport_unpack(&send_to, plain, len) == -1)
+        return 1;
+
+    if (to_host_family(&send_to.ip) == -1)
+        return 1;
 
     uint8_t ip_port[SIZE_IPPORT];
     ipport_pack(ip_port, &source);
@@ -342,8 +346,12 @@ static int handle_send_1(void *object, IP_Port source, const uint8_t *packet, ui
         return 1;
 
     IP_Port send_to;
-    ipport_unpack(&send_to, plain);
-    to_host_family(&send_to.ip);
+
+    if (ipport_unpack(&send_to, plain, len) == -1)
+        return 1;
+
+    if (to_host_family(&send_to.ip) == -1)
+        return 1;
 
     uint8_t data[ONION_MAX_PACKET_SIZE];
     data[0] = NET_PACKET_ONION_SEND_2;
@@ -391,8 +399,12 @@ static int handle_send_2(void *object, IP_Port source, const uint8_t *packet, ui
         return 1;
 
     IP_Port send_to;
-    ipport_unpack(&send_to, plain);
-    to_host_family(&send_to.ip);
+
+    if (ipport_unpack(&send_to, plain, len) == -1)
+        return 1;
+
+    if (to_host_family(&send_to.ip) == -1)
+        return 1;
 
     uint8_t data[ONION_MAX_PACKET_SIZE];
     memcpy(data, plain + SIZE_IPPORT, len - SIZE_IPPORT);
@@ -437,7 +449,9 @@ static int handle_recv_3(void *object, IP_Port source, const uint8_t *packet, ui
         return 1;
 
     IP_Port send_to;
-    ipport_unpack(&send_to, plain);
+
+    if (ipport_unpack(&send_to, plain, len) == -1)
+        return 1;
 
     uint8_t data[ONION_MAX_PACKET_SIZE];
     data[0] = NET_PACKET_ONION_RECV_2;
@@ -471,7 +485,9 @@ static int handle_recv_2(void *object, IP_Port source, const uint8_t *packet, ui
         return 1;
 
     IP_Port send_to;
-    ipport_unpack(&send_to, plain);
+
+    if (ipport_unpack(&send_to, plain, len) == -1)
+        return 1;
 
     uint8_t data[ONION_MAX_PACKET_SIZE];
     data[0] = NET_PACKET_ONION_RECV_1;
@@ -505,7 +521,9 @@ static int handle_recv_1(void *object, IP_Port source, const uint8_t *packet, ui
         return 1;
 
     IP_Port send_to;
-    ipport_unpack(&send_to, plain);
+
+    if (ipport_unpack(&send_to, plain, len) == -1)
+        return 1;
 
     uint16_t data_len = length - (1 + RETURN_1);
 
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 2e39762f..9153216d 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -133,8 +133,8 @@ static uint16_t random_nodes_path_onion(const Onion_Client *onion_c, Node_format
 
     //if (DHT_non_lan_connected(onion_c->dht)) {
     if (DHT_isconnected(onion_c->dht)) {
-        if (num_nodes < 3)
-            return random_nodes_path(onion_c->dht, nodes, max_num);
+        if (num_nodes == 0)
+            return 0;
 
         for (i = 0; i < max_num; ++i) {
             nodes[i] = onion_c->path_nodes[rand() % num_nodes];
@@ -1190,7 +1190,7 @@ static void populate_path_nodes(Onion_Client *onion_c)
 
 #define ANNOUNCE_FRIEND (ONION_NODE_PING_INTERVAL * 6)
 #define ANNOUNCE_FRIEND_BEGINNING 3
-#define FRIEND_ONION_NODE_TIMEOUT (ONION_NODE_TIMEOUT * 4)
+#define FRIEND_ONION_NODE_TIMEOUT (ONION_NODE_TIMEOUT * 6)
 
 #define RUN_COUNT_FRIEND_ANNOUNCE_BEGINNING 17
 
diff --git a/toxcore/onion_client.h b/toxcore/onion_client.h
index 7119a8bf..9a102891 100644
--- a/toxcore/onion_client.h
+++ b/toxcore/onion_client.h
@@ -30,7 +30,7 @@
 
 #define MAX_ONION_CLIENTS 8
 #define ONION_NODE_PING_INTERVAL 20
-#define ONION_NODE_TIMEOUT (ONION_NODE_PING_INTERVAL * 4)
+#define ONION_NODE_TIMEOUT (ONION_NODE_PING_INTERVAL * 3)
 
 /* The interval in seconds at which to tell our friends where we are */
 #define ONION_FAKEID_INTERVAL 30