1 files changed, 33 insertions, 36 deletions

diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 3b130602..8ba1fdc5 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -638,7 +638,12 @@ static int handle_fakeid_announce(void *object, const uint8_t *source_pubkey, co
         return 1;
 
     onion_c->friends_list[friend_num].last_noreplay = no_replay;
-    onion_set_friend_DHT_pubkey(onion_c, friend_num, data + 1 + sizeof(uint64_t), current_time_monotonic());
+
+    if (onion_c->friends_list[friend_num].dht_pk_callback)
+        onion_c->friends_list[friend_num].dht_pk_callback(onion_c->friends_list[friend_num].dht_pk_callback_object,
+                onion_c->friends_list[friend_num].dht_pk_callback_number, data + 1 + sizeof(uint64_t));
+
+    onion_set_friend_DHT_pubkey(onion_c, friend_num, data + 1 + sizeof(uint64_t));
     onion_c->friends_list[friend_num].last_seen = unix_time();
 
     uint16_t len_nodes = length - FAKEID_DATA_MIN_LENGTH;
@@ -957,8 +962,8 @@ int onion_delfriend(Onion_Client *onion_c, int friend_num)
     if ((uint32_t)friend_num >= onion_c->num_friends)
         return -1;
 
-    if (onion_c->friends_list[friend_num].is_fake_clientid)
-        DHT_delfriend(onion_c->dht, onion_c->friends_list[friend_num].fake_client_id);
+    //if (onion_c->friends_list[friend_num].is_fake_clientid)
+    //    DHT_delfriend(onion_c->dht, onion_c->friends_list[friend_num].fake_client_id, 0);
 
     memset(&(onion_c->friends_list[friend_num]), 0, sizeof(Onion_Friend));
     uint32_t i;
@@ -996,22 +1001,37 @@ int recv_tcp_relay_handler(Onion_Client *onion_c, int friend_num, int (*tcp_rela
     return 0;
 }
 
-/* Set a friends DHT public key.
- * timestamp is the time (current_time_monotonic()) at which the key was last confirmed belonging to
- * the other peer.
+/* Set the function for this friend that will be callbacked with object and number
+ * when that friend gives us his DHT temporary public key.
+ *
+ * object and number will be passed as argument to this function.
  *
  * return -1 on failure.
  * return 0 on success.
  */
-int onion_set_friend_DHT_pubkey(Onion_Client *onion_c, int friend_num, const uint8_t *dht_key, uint64_t timestamp)
+int onion_dht_pk_callback(Onion_Client *onion_c, int friend_num, void (*function)(void *data, int32_t number,
+                          const uint8_t *dht_public_key), void *object, uint32_t number)
 {
     if ((uint32_t)friend_num >= onion_c->num_friends)
         return -1;
 
-    if (onion_c->friends_list[friend_num].status == 0)
+    onion_c->friends_list[friend_num].dht_pk_callback = function;
+    onion_c->friends_list[friend_num].dht_pk_callback_object = object;
+    onion_c->friends_list[friend_num].dht_pk_callback_number = number;
+    return 0;
+}
+
+/* Set a friends DHT public key.
+ *
+ * return -1 on failure.
+ * return 0 on success.
+ */
+int onion_set_friend_DHT_pubkey(Onion_Client *onion_c, int friend_num, const uint8_t *dht_key)
+{
+    if ((uint32_t)friend_num >= onion_c->num_friends)
         return -1;
 
-    if (onion_c->friends_list[friend_num].fake_client_id_timestamp >= timestamp)
+    if (onion_c->friends_list[friend_num].status == 0)
         return -1;
 
     if (onion_c->friends_list[friend_num].is_fake_clientid) {
@@ -1019,16 +1039,11 @@ int onion_set_friend_DHT_pubkey(Onion_Client *onion_c, int friend_num, const uin
             return -1;
         }
 
-        DHT_delfriend(onion_c->dht, onion_c->friends_list[friend_num].fake_client_id);
-    }
-
-    if (DHT_addfriend(onion_c->dht, dht_key) == 1) {
-        return -1;
+        onion_c->friends_list[friend_num].is_fake_clientid = 0;
     }
 
     onion_c->friends_list[friend_num].last_seen = unix_time();
     onion_c->friends_list[friend_num].is_fake_clientid = 1;
-    onion_c->friends_list[friend_num].fake_client_id_timestamp = timestamp;
     memcpy(onion_c->friends_list[friend_num].fake_client_id, dht_key, crypto_box_PUBLICKEYBYTES);
 
     return 0;
@@ -1037,9 +1052,9 @@ int onion_set_friend_DHT_pubkey(Onion_Client *onion_c, int friend_num, const uin
 /* Copy friends DHT public key into dht_key.
  *
  * return 0 on failure (no key copied).
- * return timestamp on success (key copied).
+ * return 1 on success (key copied).
  */
-uint64_t onion_getfriend_DHT_pubkey(const Onion_Client *onion_c, int friend_num, uint8_t *dht_key)
+unsigned int onion_getfriend_DHT_pubkey(const Onion_Client *onion_c, int friend_num, uint8_t *dht_key)
 {
     if ((uint32_t)friend_num >= onion_c->num_friends)
         return 0;
@@ -1051,7 +1066,7 @@ uint64_t onion_getfriend_DHT_pubkey(const Onion_Client *onion_c, int friend_num,
         return 0;
 
     memcpy(dht_key, onion_c->friends_list[friend_num].fake_client_id, crypto_box_PUBLICKEYBYTES);
-    return onion_c->friends_list[friend_num].fake_client_id_timestamp;
+    return 1;
 }
 
 /* Get the ip of friend friendnum and put it in ip_port
@@ -1189,23 +1204,6 @@ static void do_friend(Onion_Client *onion_c, uint16_t friendnum)
     }
 }
 
-/* Timeout before which a peer is considered dead and removed from the DHT search. */
-#define DEAD_ONION_TIMEOUT (10 * 60)
-
-static void cleanup_friend(Onion_Client *onion_c, uint16_t friendnum)
-{
-    if (friendnum >= onion_c->num_friends)
-        return;
-
-    if (onion_c->friends_list[friendnum].status == 0)
-        return;
-
-    if (onion_c->friends_list[friendnum].is_fake_clientid && !onion_c->friends_list[friendnum].is_online
-            && is_timeout(onion_c->friends_list[friendnum].last_seen, DEAD_ONION_TIMEOUT)) {
-        onion_c->friends_list[friendnum].is_fake_clientid = 0;
-        DHT_delfriend(onion_c->dht, onion_c->friends_list[friendnum].fake_client_id);
-    }
-}
 
 /* Function to call when onion data packet with contents beginning with byte is received. */
 void oniondata_registerhandler(Onion_Client *onion_c, uint8_t byte, oniondata_handler_callback cb, void *object)
@@ -1278,7 +1276,6 @@ void do_onion_client(Onion_Client *onion_c)
     if (onion_isconnected(onion_c)) {
         for (i = 0; i < onion_c->num_friends; ++i) {
             do_friend(onion_c, i);
-            cleanup_friend(onion_c, i);
         }
     }