10 files changed, 96 insertions, 52 deletions

diff --git a/docs/updates/DHT.md b/docs/updates/DHT.md
index 17db70ce..86fad3d1 100644
--- a/docs/updates/DHT.md
+++ b/docs/updates/DHT.md
@@ -36,39 +36,39 @@ Send a get nodes request every 20 seconds to a random good node in the client li
 
 When a client receives any request from another
 -----------------------------------------------
--Respond to the request
-    -Ping request is replied to with with a ping response containing the same encrypted data
-    -Get nodes request is replied with a send nodes reply containing the same encrypted data and the good nodes from the client list and/or the "friends" list that are closest to the requested_node_id
+- Respond to the request
+    - Ping request is replied to with with a ping response containing the same encrypted data
+    - Get nodes request is replied with a send nodes reply containing the same encrypted data and the good nodes from the client list and/or the "friends" list that are closest to the requested_node_id
 
--If the requesting client is not in the client list:
-    -If there are no bad clients in the list and the list is full:
-        -If the id of the other client is closer (mathematically see bittorrent doc) than at least one of the clients in the list or our "friends" list:
-            -Send a ping request to the client.
-        -if not forget about the client.
+- If the requesting client is not in the client list:
+    - If there are no bad clients in the list and the list is full:
+        - If the id of the other client is closer (mathematically see bittorrent doc) than at least one of the clients in the list or our "friends" list:
+            - Send a ping request to the client.
+        - if not forget about the client.
 
-    -If there are bad clients and/or the list isn't full:
-        -Send a ping request to the client 
+    - If there are bad clients and/or the list isn't full:
+        - Send a ping request to the client 
 
 When a client receives a response
 ---------------------------------
--Ping response
-    -If the node was previously pinged with a matching ping_id (check in the corresponding pinged list.)
-        -If the node is in the client list the matching client's timestamp is set to current time.
-        -If the node is in the "friends" list the matching client's timestamp is set to current time for every occurrence.
-        -If the node is not in the client list:
-            -If the list isn't full, add it to the list.
-            -If the list is full, the furthest away (mathematically see bittorrent doc) bad client is replaced by the new one.
-            -If the list is filled with good nodes replace the furthest client with it only if it is closer than the replaced node.
-        -for each friend in the "friends" list:
-            -If that friend's client list isn't full, add that client to it
-            -If that friend's client list contains bad clients, replace the furthest one with that client.
-            -If that friend's client list contains only good clients
-                -If the client is closer to the friend than one of the other clients, it replaces the farthest one
-                -If not, nothing happens.
-
-    -Send nodes
-        -If the ping_id matches what we sent previously (check in the corresponding pinged list.):
-            -Each node in the response is pinged.
+- Ping response
+    - If the node was previously pinged with a matching ping_id (check in the corresponding pinged list.)
+        - If the node is in the client list the matching client's timestamp is set to current time.
+        - If the node is in the "friends" list the matching client's timestamp is set to current time for every occurrence.
+        - If the node is not in the client list:
+            - If the list isn't full, add it to the list.
+            - If the list is full, the furthest away (mathematically see bittorrent doc) bad client is replaced by the new one.
+            - If the list is filled with good nodes replace the furthest client with it only if it is closer than the replaced node.
+        - for each friend in the "friends" list:
+            - If that friend's client list isn't full, add that client to it
+            - If that friend's client list contains bad clients, replace the furthest one with that client.
+            - If that friend's client list contains only good clients
+                - If the client is closer to the friend than one of the other clients, it replaces the farthest one
+                - If not, nothing happens.
+
+    - Send nodes
+        - If the ping_id matches what we sent previously (check in the corresponding pinged list.):
+            - Each node in the response is pinged.
 
 
 
diff --git a/toxav/msi.c b/toxav/msi.c
index 138c8d3f..4445f567 100644
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -486,7 +486,7 @@ struct timer_function_args {
  * @param timeout Timeout in ms
  * @return int
  */
-static int timer_alloc ( TimerHandler *timers_container, void *(func)(void *), void *arg1, int arg2, uint32_t timeout)
+static int timer_alloc ( TimerHandler *timers_container, void * (func)(void *), void *arg1, int arg2, uint32_t timeout)
 {
     static int timer_id;
     pthread_mutex_lock(&timers_container->mutex);
@@ -631,6 +631,15 @@ static void *timer_poll( void *arg )
         usleep(handler->resolution);
     }
 
+    size_t i = 0;
+
+    for (; i < handler->max_capacity; i ++)
+        free(handler->timers[i]);
+
+    free(handler->timers);
+
+    pthread_mutex_destroy( &handler->mutex );
+
     free(handler);
     pthread_exit(NULL);
 }
@@ -691,15 +700,6 @@ static void timer_terminate_session(TimerHandler *handler)
     handler->running = 0;
 
     pthread_mutex_unlock(&handler->mutex);
-
-    size_t i = 0;
-
-    for (; i < handler->max_capacity; i ++)
-        free(handler->timers[i]);
-
-    free(handler->timers);
-
-    pthread_mutex_destroy( &handler->mutex );
 }
 
 /**
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 7cba031e..8549bc05 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -588,6 +588,8 @@ int toxav_kill_transmission ( ToxAv *av, int32_t call_index )
     codec_terminate_session(call->cs);
     call->cs = NULL;
 
+    free(call->frame_buf);
+
     pthread_mutex_unlock(&call->mutex);
     pthread_mutex_destroy(&call->mutex);
 
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 4841cbd9..eaf87179 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2648,10 +2648,9 @@ uint32_t messenger_size(const Messenger *m)
 
 static uint8_t *z_state_save_subheader(uint8_t *data, uint32_t len, uint16_t type)
 {
-    memcpy(data, &len, sizeof(uint32_t));
+    host_to_lendian32(data, len);
     data += sizeof(uint32_t);
-    uint32_t temp = (MESSENGER_STATE_COOKIE_TYPE << 16) | type;
-    memcpy(data, &temp, sizeof(uint32_t));
+    host_to_lendian32(data, (host_tolendian16(MESSENGER_STATE_COOKIE_TYPE) << 16) | host_tolendian16(type));
     data += sizeof(uint32_t);
     return data;
 }
diff --git a/toxcore/group.c b/toxcore/group.c
index 26df82bd..24f0b72e 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -190,7 +190,7 @@ static int get_peer_index(Group_c *g, uint16_t peer_number)
 
 static uint16_t calculate_comp_value(const uint8_t *pk1, const uint8_t *pk2)
 {
-    uint8_t cmp1, cmp2;
+    uint8_t cmp1, cmp2 = 0;
 
     for (cmp1 = crypto_box_PUBLICKEYBYTES; cmp1 != 0; --cmp1) {
         uint8_t index = crypto_box_PUBLICKEYBYTES - cmp1;
@@ -1025,7 +1025,7 @@ static void handle_friend_invite_packet(Messenger *m, int32_t friendnumber, cons
                 return;
 
             uint16_t peer_number = rand(); /* TODO: what if two people enter the group at the same time and
-                                  are given the same peer_number by different nodes? */
+                              are given the same peer_number by different nodes? */
             unsigned int tries = 0;
 
             while (get_peer_index(g, peer_number) != -1) {
@@ -1282,6 +1282,8 @@ static void handle_direct_packet(Group_Chats *g_c, int groupnumber, const uint8_
             }
         }
 
+        break;
+
         case PEER_QUERY_ID: {
             Group_c *g = get_group_c(g_c, groupnumber);
 
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 63012ce6..c83c5d54 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -835,8 +835,9 @@ static int64_t send_lossless_packet(Net_Crypto *c, int crypt_connection_id, cons
 
     if (send_data_packet_helper(c, crypt_connection_id, conn->recv_array.buffer_start, packet_num, data, length) == 0) {
         Packet_Data *dt1 = NULL;
-        get_data_pointer(&conn->send_array, &dt1, packet_num);
-        dt1->time = temp_time;
+
+        if (get_data_pointer(&conn->send_array, &dt1, packet_num) == 1)
+            dt1->time = temp_time;
     } else {
         conn->maximum_speed_reached = 1;
         LOGGER_ERROR("send_data_packet failed\n");
@@ -1322,8 +1323,10 @@ static int create_crypto_connection(Net_Crypto *c)
         ++c->crypto_connections_length;
         memset(&(c->crypto_connections[id]), 0, sizeof(Crypto_Connection));
 
-        if (pthread_mutex_init(&c->crypto_connections[id].mutex, NULL) != 0)
+        if (pthread_mutex_init(&c->crypto_connections[id].mutex, NULL) != 0) {
+            pthread_mutex_unlock(&c->connections_mutex);
             return -1;
+        }
     }
 
     pthread_mutex_unlock(&c->connections_mutex);
@@ -1817,6 +1820,7 @@ static int tcp_oob_callback(void *object, const uint8_t *public_key, const uint8
 
     if (crypt_connection_id == -1) {
         IP_Port source;
+        source.port = 0;
         source.ip.family = TCP_FAMILY;
         source.ip.ip6.uint32[0] = location;
 
diff --git a/toxcore/onion_announce.c b/toxcore/onion_announce.c
index b25b6b11..2b0de595 100644
--- a/toxcore/onion_announce.c
+++ b/toxcore/onion_announce.c
@@ -178,6 +178,9 @@ int send_data_request(Networking_Core *net, const Onion_Path *path, IP_Port dest
     uint8_t packet[ONION_MAX_PACKET_SIZE];
     len = create_onion_packet(packet, sizeof(packet), path, dest, request, len);
 
+    if (len == -1)
+        return -1;
+
     if (sendpacket(net, path->ip_port1, packet, len) != len)
         return -1;
 
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 11858d4c..24949aff 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -1126,10 +1126,10 @@ static void populate_path_nodes(Onion_Client *onion_c)
 }
 
 #define ANNOUNCE_FRIEND (ONION_NODE_PING_INTERVAL * 3)
-#define ANNOUNCE_FRIEND_BEGINNING 5
+#define ANNOUNCE_FRIEND_BEGINNING 3
 #define FRIEND_ONION_NODE_TIMEOUT (ONION_NODE_TIMEOUT * 3)
 
-#define RUN_COUNT_FRIEND_ANNOUNCE_BEGINNING 15
+#define RUN_COUNT_FRIEND_ANNOUNCE_BEGINNING 17
 
 static void do_friend(Onion_Client *onion_c, uint16_t friendnum)
 {
diff --git a/toxcore/util.c b/toxcore/util.c
index ee4fa3b2..3d444b07 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -84,6 +84,35 @@ void host_to_net(uint8_t *num, uint16_t numbytes)
     return;
 }
 
+uint16_t lendian_to_host16(uint16_t lendian)
+{
+#ifdef WORDS_BIGENDIAN
+    return  (lendian << 8) | (lendian >> 8 );
+#else
+    return lendian;
+#endif
+}
+
+void host_to_lendian32(uint8_t *dest,  uint32_t num)
+{
+#ifdef WORDS_BIGENDIAN
+    num = ((num << 8) & 0xFF00FF00 ) | ((num >> 8) & 0xFF00FF );
+    num = (num << 16) | (num >> 16);
+#endif
+    memcpy(dest, &num, sizeof(uint32_t));
+}
+
+void lendian_to_host32(uint32_t *dest, const uint8_t *lendian)
+{
+    uint32_t d;
+    memcpy(&d, lendian, sizeof(uint32_t));
+#ifdef WORDS_BIGENDIAN
+    d = ((d << 8) & 0xFF00FF00 ) | ((d >> 8) & 0xFF00FF );
+    d = (d << 16) | (d >> 16);
+#endif
+    *dest = d;
+}
+
 /* state load/save */
 int load_state(load_state_callback_func load_state_callback, void *outer,
                const uint8_t *data, uint32_t length, uint16_t cookie_inner)
@@ -101,8 +130,8 @@ int load_state(load_state_callback_func load_state_callback, void *outer,
     uint32_t size_head = sizeof(uint32_t) * 2;
 
     while (length >= size_head) {
-        memcpy(&length_sub, data, sizeof(length_sub));
-        memcpy(&cookie_type, data + sizeof(length_sub), sizeof(cookie_type));
+        lendian_to_host32(&length_sub, data);
+        lendian_to_host32(&cookie_type, data + sizeof(length_sub));
         data += size_head;
         length -= size_head;
 
@@ -114,7 +143,7 @@ int load_state(load_state_callback_func load_state_callback, void *outer,
             return -1;
         }
 
-        if ((cookie_type >> 16) != cookie_inner) {
+        if (lendian_to_host16((cookie_type >> 16)) != cookie_inner) {
             /* something is not matching up in a bad way, give up */
 #ifdef DEBUG
             fprintf(stderr, "state file garbeled: %04hx != %04hx\n", (cookie_type >> 16), cookie_inner);
@@ -122,7 +151,7 @@ int load_state(load_state_callback_func load_state_callback, void *outer,
             return -1;
         }
 
-        type = cookie_type & 0xFFFF;
+        type = lendian_to_host16(cookie_type & 0xFFFF);
 
         if (-1 == load_state_callback(outer, data, length_sub, type))
             return -1;
diff --git a/toxcore/util.h b/toxcore/util.h
index 7992a985..e90eee0f 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -42,6 +42,11 @@ uint32_t id_copy(uint8_t *dest, const uint8_t *src); /* return value is CLIENT_I
 void host_to_net(uint8_t *num, uint16_t numbytes);
 #define net_to_host(x, y) host_to_net(x, y)
 
+uint16_t lendian_to_host16(uint16_t lendian);
+#define host_tolendian16(x) lendian_to_host16(x)
+
+void host_to_lendian32(uint8_t *dest,  uint32_t num);
+
 /* state load/save */
 typedef int (*load_state_callback_func)(void *outer, const uint8_t *data, uint32_t len, uint16_t type);
 int load_state(load_state_callback_func load_state_callback, void *outer,