1 files changed, 38 insertions, 24 deletions

diff --git a/toxcore/friend_connection.c b/toxcore/friend_connection.c
index 892048ad..c13ca949 100644
--- a/toxcore/friend_connection.c
+++ b/toxcore/friend_connection.c
@@ -292,30 +292,6 @@ static void change_dht_pk(Friend_Connections *fr_c, int friendcon_id, const uint
     memcpy(friend_con->dht_temp_pk, dht_public_key, crypto_box_PUBLICKEYBYTES);
 }
 
-/* Callback for dht public key changes. */
-static void dht_pk_callback(void *object, int32_t number, const uint8_t *dht_public_key)
-{
-    Friend_Connections *fr_c = object;
-    Friend_Conn *friend_con = get_conn(fr_c, number);
-
-    if (!friend_con)
-        return;
-
-    if (memcmp(friend_con->dht_temp_pk, dht_public_key, crypto_box_PUBLICKEYBYTES) == 0)
-        return;
-
-    change_dht_pk(fr_c, number, dht_public_key);
-
-    /* if pk changed, create a new connection.*/
-    if (friend_con->crypt_connection_id != -1) {
-        crypto_kill(fr_c->net_crypto, friend_con->crypt_connection_id);
-        friend_con->crypt_connection_id = -1;
-    }
-
-    friend_new_connection(fr_c, number);
-    onion_set_friend_DHT_pubkey(fr_c->onion_c, friend_con->onion_friendnum, dht_public_key);
-}
-
 static int handle_status(void *object, int number, uint8_t status)
 {
     Friend_Connections *fr_c = object;
@@ -356,6 +332,31 @@ static int handle_status(void *object, int number, uint8_t status)
     return 0;
 }
 
+/* Callback for dht public key changes. */
+static void dht_pk_callback(void *object, int32_t number, const uint8_t *dht_public_key)
+{
+    Friend_Connections *fr_c = object;
+    Friend_Conn *friend_con = get_conn(fr_c, number);
+
+    if (!friend_con)
+        return;
+
+    if (memcmp(friend_con->dht_temp_pk, dht_public_key, crypto_box_PUBLICKEYBYTES) == 0)
+        return;
+
+    change_dht_pk(fr_c, number, dht_public_key);
+
+    /* if pk changed, create a new connection.*/
+    if (friend_con->crypt_connection_id != -1) {
+        crypto_kill(fr_c->net_crypto, friend_con->crypt_connection_id);
+        friend_con->crypt_connection_id = -1;
+        handle_status(object, number, 0); /* Going offline. */
+    }
+
+    friend_new_connection(fr_c, number);
+    onion_set_friend_DHT_pubkey(fr_c->onion_c, friend_con->onion_friendnum, dht_public_key);
+}
+
 static int handle_packet(void *object, int number, uint8_t *data, uint16_t length)
 {
     if (length == 0)
@@ -757,10 +758,20 @@ Friend_Connections *new_friend_connections(Onion_Client *onion_c)
     temp->onion_c = onion_c;
 
     new_connection_handler(temp->net_crypto, &handle_new_connections, temp);
+    LANdiscovery_init(temp->dht);
 
     return temp;
 }
 
+/* Send a LAN discovery packet every LAN_DISCOVERY_INTERVAL seconds. */
+static void LANdiscovery(Friend_Connections *fr_c)
+{
+    if (fr_c->last_LANdiscovery + LAN_DISCOVERY_INTERVAL < unix_time()) {
+        send_LANdiscovery(htons(TOX_PORT_DEFAULT), fr_c->dht);
+        fr_c->last_LANdiscovery = unix_time();
+    }
+}
+
 /* main friend_connections loop. */
 void do_friend_connections(Friend_Connections *fr_c)
 {
@@ -808,6 +819,8 @@ void do_friend_connections(Friend_Connections *fr_c)
             }
         }
     }
+
+    LANdiscovery(fr_c);
 }
 
 /* Free everything related with friend_connections. */
@@ -822,5 +835,6 @@ void kill_friend_connections(Friend_Connections *fr_c)
         kill_friend_connection(fr_c, i);
     }
 
+    LANdiscovery_kill(fr_c->dht);
     free(fr_c);
 }