Merge branch 'master' of https://github.com/irungentoo/toxcore

1 files changed, 103 insertions, 35 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index ca4e021b..db03def1 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -620,7 +620,7 @@ static int replace_all(   Client_data    *list,
                           const uint8_t  *comp_client_id )
 {
     if ((ip_port.ip.family != AF_INET) && (ip_port.ip.family != AF_INET6))
-        return 1;
+        return 0;
 
     uint32_t i, replace = ~0, bad = ~0, possibly_bad = ~0, good = ~0;
 
@@ -708,14 +708,41 @@ int addto_lists(DHT *dht, IP_Port ip_port, const uint8_t *client_id)
     } else
         used++;
 
+    DHT_Friend *friend_foundip = 0;
+
     for (i = 0; i < dht->num_friends; ++i) {
         if (!client_or_ip_port_in_list(dht->friends_list[i].client_list,
                                        MAX_FRIEND_CLIENTS, client_id, ip_port)) {
             if (replace_all(dht->friends_list[i].client_list, MAX_FRIEND_CLIENTS,
-                            client_id, ip_port, dht->friends_list[i].client_id))
+                            client_id, ip_port, dht->friends_list[i].client_id)) {
+
+                DHT_Friend *friend = &dht->friends_list[i];
+
+                if (memcmp(client_id, friend->client_id, CLIENT_ID_SIZE) == 0) {
+                    friend_foundip = friend;
+                }
+
                 used++;
-        } else
+            }
+        } else {
+            DHT_Friend *friend = &dht->friends_list[i];
+
+            if (memcmp(client_id, friend->client_id, CLIENT_ID_SIZE) == 0) {
+                friend_foundip = friend;
+            }
+
             used++;
+        }
+    }
+
+    if (friend_foundip) {
+        uint32_t j;
+
+        for (j = 0; j < friend_foundip->lock_count; ++j) {
+            if (friend_foundip->callbacks[j].ip_callback)
+                friend_foundip->callbacks[j].ip_callback(friend_foundip->callbacks[j].data, friend_foundip->callbacks[j].number,
+                        ip_port);
+        }
     }
 
 #ifdef ENABLE_ASSOC_DHT
@@ -1089,23 +1116,54 @@ static void get_bunchnodes(DHT *dht, Client_data *list, uint16_t length, uint16_
     }
 }
 */
-int DHT_addfriend(DHT *dht, const uint8_t *client_id)
+int DHT_addfriend(DHT *dht, const uint8_t *client_id, void (*ip_callback)(void *data, int32_t number, IP_Port),
+                  void *data, int32_t number, uint16_t *lock_count)
 {
-    if (friend_number(dht, client_id) != -1) /* Is friend already in DHT? */
-        return 1;
+    int friend_num = friend_number(dht, client_id);
+
+    uint16_t lock_num;
+
+    if (friend_num != -1) { /* Is friend already in DHT? */
+        DHT_Friend *friend = &dht->friends_list[friend_num];
+
+        if (friend->lock_count == DHT_FRIEND_MAX_LOCKS)
+            return -1;
+
+        lock_num = friend->lock_count;
+        ++friend->lock_count;
+        friend->callbacks[lock_num].ip_callback = ip_callback;
+        friend->callbacks[lock_num].data = data;
+        friend->callbacks[lock_num].number = number;
+
+        if (lock_count)
+            *lock_count = lock_num + 1;
+
+        return 0;
+    }
 
     DHT_Friend *temp;
     temp = realloc(dht->friends_list, sizeof(DHT_Friend) * (dht->num_friends + 1));
 
     if (temp == NULL)
-        return 1;
+        return -1;
 
     dht->friends_list = temp;
-    memset(&dht->friends_list[dht->num_friends], 0, sizeof(DHT_Friend));
-    memcpy(dht->friends_list[dht->num_friends].client_id, client_id, CLIENT_ID_SIZE);
+    DHT_Friend *friend = &dht->friends_list[dht->num_friends];
+    memset(friend, 0, sizeof(DHT_Friend));
+    memcpy(friend->client_id, client_id, CLIENT_ID_SIZE);
 
-    dht->friends_list[dht->num_friends].nat.NATping_id = random_64b();
+    friend->nat.NATping_id = random_64b();
     ++dht->num_friends;
+
+    lock_num = friend->lock_count;
+    ++friend->lock_count;
+    friend->callbacks[lock_num].ip_callback = ip_callback;
+    friend->callbacks[lock_num].data = data;
+    friend->callbacks[lock_num].number = number;
+
+    if (lock_count)
+        *lock_count = lock_num + 1;
+
 #ifdef ENABLE_ASSOC_DHT
 
     if (dht->assoc) {
@@ -1143,39 +1201,49 @@ int DHT_addfriend(DHT *dht, const uint8_t *client_id)
     return 0;
 }
 
-int DHT_delfriend(DHT *dht, const uint8_t *client_id)
+int DHT_delfriend(DHT *dht, const uint8_t *client_id, uint16_t lock_count)
 {
-    uint32_t i;
-    DHT_Friend *temp;
+    int friend_num = friend_number(dht, client_id);
 
-    for (i = 0; i < dht->num_friends; ++i) {
-        /* Equal */
-        if (id_equal(dht->friends_list[i].client_id, client_id)) {
-            --dht->num_friends;
+    if (friend_num == -1) {
+        return -1;
+    }
 
-            if (dht->num_friends != i) {
-                memcpy( &dht->friends_list[i],
-                        &dht->friends_list[dht->num_friends],
-                        sizeof(DHT_Friend) );
-            }
+    DHT_Friend *friend = &dht->friends_list[friend_num];
+    --friend->lock_count;
 
-            if (dht->num_friends == 0) {
-                free(dht->friends_list);
-                dht->friends_list = NULL;
-                return 0;
-            }
+    if (friend->lock_count && lock_count) { /* DHT friend is still in use.*/
+        --lock_count;
+        friend->callbacks[lock_count].ip_callback = NULL;
+        friend->callbacks[lock_count].data = NULL;
+        friend->callbacks[lock_count].number = 0;
+        return 0;
+    }
+
+    uint32_t i;
+    DHT_Friend *temp;
 
-            temp = realloc(dht->friends_list, sizeof(DHT_Friend) * (dht->num_friends));
+    --dht->num_friends;
 
-            if (temp == NULL)
-                return 1;
+    if (dht->num_friends != friend_num) {
+        memcpy( &dht->friends_list[friend_num],
+                &dht->friends_list[dht->num_friends],
+                sizeof(DHT_Friend) );
+    }
 
-            dht->friends_list = temp;
-            return 0;
-        }
+    if (dht->num_friends == 0) {
+        free(dht->friends_list);
+        dht->friends_list = NULL;
+        return 0;
     }
 
-    return 1;
+    temp = realloc(dht->friends_list, sizeof(DHT_Friend) * (dht->num_friends));
+
+    if (temp == NULL)
+        return -1;
+
+    dht->friends_list = temp;
+    return 0;
 }
 
 /* TODO: Optimize this. */
@@ -2216,7 +2284,7 @@ DHT *new_DHT(Networking_Core *net)
     for (i = 0; i < DHT_FAKE_FRIEND_NUMBER; ++i) {
         uint8_t random_key_bytes[CLIENT_ID_SIZE];
         randombytes(random_key_bytes, sizeof(random_key_bytes));
-        DHT_addfriend(dht, random_key_bytes);
+        DHT_addfriend(dht, random_key_bytes, 0, 0, 0, 0);
     }
 
     return dht;