2 files changed, 18 insertions, 7 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index b4caa113..e748da7c 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -1335,22 +1335,31 @@ int DHT_getfriendip(const DHT *dht, const uint8_t *public_key, IP_Port *ip_port)
     return -1;
 }
 
-static void divide_by_2(uint8_t *public_key)
+static void abs_divide_by_2(uint8_t *public_key_dist)
 {
     unsigned int i;
-    _Bool one = 0;
+    _Bool one = 0, abs = 0;
+
+    if (public_key_dist[0] & (1 << 7)) {
+        for (i = 0; i < crypto_box_PUBLICKEYBYTES; ++i) {
+            public_key_dist[i] = ~public_key_dist[i];
+        }
+
+        if (public_key_dist[crypto_box_PUBLICKEYBYTES - 1] != UINT8_MAX)
+            ++public_key_dist[crypto_box_PUBLICKEYBYTES - 1];
+    }
 
     for (i = 0; i < crypto_box_PUBLICKEYBYTES; ++i) {
         _Bool temp = 0;
 
-        if (public_key[i] & (1)) {
+        if (public_key_dist[i] & (1)) {
             temp = 1;
         }
 
-        public_key[i] >>= 1;
+        public_key_dist[i] >>= 1;
 
         if (one)
-            public_key[i] += (1 << 7);
+            public_key_dist[i] += (1 << 7);
 
         one = temp;
     }
@@ -1364,7 +1373,7 @@ static void find_midpoint(uint8_t *out, const uint8_t *top, const uint8_t *bot)
         out[i] = top[i] ^ bot[i];
     }
 
-    divide_by_2(out);
+    abs_divide_by_2(out);
 
     for (i = 0; i < crypto_box_PUBLICKEYBYTES; ++i) {
         out[i] ^= bot[i];
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 2bbe420e..d6d078e1 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -597,7 +597,9 @@ static int client_ping_nodes(Onion_Client *onion_c, uint32_t num, const Node_for
                 continue;
 
         if (is_timeout(list_nodes[0].timestamp, ONION_NODE_TIMEOUT)
-                || id_closest(reference_id, list_nodes[0].public_key, nodes[i].public_key) == 2) {
+                || id_closest(reference_id, list_nodes[0].public_key, nodes[i].public_key) == 2
+                || is_timeout(list_nodes[1].timestamp, ONION_NODE_TIMEOUT)
+                || id_closest(reference_id, list_nodes[1].public_key, nodes[i].public_key) == 2 ) {
             /* check if node is already in list. */
             for (j = 0; j < list_length; ++j) {
                 if (memcmp(list_nodes[j].public_key, nodes[i].public_key, crypto_box_PUBLICKEYBYTES) == 0) {