1 files changed, 32 insertions, 24 deletions

diff --git a/core/Messenger.c b/core/Messenger.c
index cb3d2551..25a4ff98 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -108,9 +108,8 @@ static uint16_t address_checksum(uint8_t *address, uint32_t len)
  */
 void getaddress(Messenger *m, uint8_t *address)
 {
-    //memcpy(address, m->public_key, crypto_box_PUBLICKEYBYTES); //TODO
-    memcpy(address, self_public_key, crypto_box_PUBLICKEYBYTES);
-    uint32_t nospam = get_nospam();
+    memcpy(address, m->net_crypto->self_public_key, crypto_box_PUBLICKEYBYTES);
+    uint32_t nospam = get_nospam(&(m->fr));
     memcpy(address + crypto_box_PUBLICKEYBYTES, &nospam, sizeof(nospam));
     uint16_t checksum = address_checksum(address, FRIEND_ADDRESS_SIZE - sizeof(checksum));
     memcpy(address + crypto_box_PUBLICKEYBYTES + sizeof(nospam), &checksum, sizeof(checksum));
@@ -150,7 +149,7 @@ int m_addfriend(Messenger *m, uint8_t *address, uint8_t *data, uint16_t length)
     if (length < 1)
         return FAERR_NOMESSAGE;
 
-    if (memcmp(client_id, self_public_key, crypto_box_PUBLICKEYBYTES) == 0)
+    if (memcmp(client_id, m->net_crypto->self_public_key, crypto_box_PUBLICKEYBYTES) == 0)
         return FAERR_OWNKEY;
 
     int friend_id = getfriend_id(m, client_id);
@@ -176,7 +175,7 @@ int m_addfriend(Messenger *m, uint8_t *address, uint8_t *data, uint16_t length)
 
     for (i = 0; i <= m->numfriends; ++i)  {
         if (m->friendlist[i].status == NOFRIEND) {
-            DHT_addfriend(client_id);
+            DHT_addfriend(m->dht, client_id);
             m->friendlist[i].status = FRIEND_ADDED;
             m->friendlist[i].crypt_connection_id = -1;
             m->friendlist[i].friendrequest_lastsent = 0;
@@ -216,7 +215,7 @@ int m_addfriend_norequest(Messenger *m, uint8_t *client_id)
 
     for (i = 0; i <= m->numfriends; ++i) {
         if (m->friendlist[i].status == NOFRIEND) {
-            DHT_addfriend(client_id);
+            DHT_addfriend(m->dht, client_id);
             m->friendlist[i].status = FRIEND_CONFIRMED;
             m->friendlist[i].crypt_connection_id = -1;
             m->friendlist[i].friendrequest_lastsent = 0;
@@ -245,7 +244,7 @@ int m_delfriend(Messenger *m, int friendnumber)
     if (friendnumber >= m->numfriends || friendnumber < 0)
         return -1;
 
-    DHT_delfriend(m->friendlist[friendnumber].client_id);
+    DHT_delfriend(m->dht, m->friendlist[friendnumber].client_id);
     crypto_kill(m->net_crypto, m->friendlist[friendnumber].crypt_connection_id);
     free(m->friendlist[friendnumber].statusmessage);
     memset(&(m->friendlist[friendnumber]), 0, sizeof(Friend));
@@ -522,7 +521,7 @@ void m_set_sends_receipts(Messenger *m, int friendnumber, int yesno)
 /* set the function that will be executed when a friend request is received. */
 void m_callback_friendrequest(Messenger *m, void (*function)(uint8_t *, uint8_t *, uint16_t, void *), void *userdata)
 {
-    callback_friendrequest(function, userdata);
+    callback_friendrequest(&(m->fr), function, userdata);
 }
 
 /* set the function that will be executed when a message from a friend is received. */
@@ -617,7 +616,7 @@ int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_id, uint
 /*Send a LAN discovery packet every LAN_DISCOVERY_INTERVAL seconds*/
 int LANdiscovery(timer *t, void *arg)
 {
-    send_LANdiscovery(htons(PORT));
+    send_LANdiscovery(htons(PORT), temp_net_crypto);
     timer_start(t, LAN_DISCOVERY_INTERVAL);
     return 0;
 }
@@ -637,19 +636,26 @@ Messenger *initMessenger(void)
     }
     m->net_crypto = new_net_crypto(m->net);
     if (m->net_crypto == NULL) {
+        kill_networking(m->net);
+        free(m);
+        return NULL;
+    }
+    m->dht = new_DHT(m->net_crypto);
+    if (m->dht == NULL) {
+        kill_net_crypto(m->net_crypto);
+        kill_networking(m->net);
         free(m);
-        free(m->net);
         return NULL;
     }
     new_keys(m->net_crypto);
     m_set_statusmessage(m, (uint8_t *)"Online", sizeof("Online"));
 
-    DHT_init();
-    friendreq_init();
-    LANdiscovery_init();
-    set_nospam(random_int());
+    friendreq_init(&(m->fr), m->net_crypto);
+    LANdiscovery_init(m->dht);
+    set_nospam(&(m->fr), random_int());
+    init_cryptopackets(m->dht);
 
-    send_LANdiscovery(htons(PORT));
+    send_LANdiscovery(htons(PORT), m->net_crypto);
     timer_single(&LANdiscovery, 0, LAN_DISCOVERY_INTERVAL);
 
     return m;
@@ -661,7 +667,9 @@ void cleanupMessenger(Messenger *m)
     /* FIXME TODO ideally cleanupMessenger will mirror initMessenger
      * this requires the other modules to expose cleanup functions
      */
+    kill_DHT(m->dht);
     kill_net_crypto(m->net_crypto);
+    kill_networking(m->net);
     free(m->friendlist);
     free(m);
 }
@@ -677,7 +685,7 @@ void doFriends(Messenger *m)
 
     for (i = 0; i < m->numfriends; ++i) {
         if (m->friendlist[i].status == FRIEND_ADDED) {
-            int fr = send_friendrequest(m->friendlist[i].client_id, m->friendlist[i].friendrequest_nospam, m->friendlist[i].info,
+            int fr = send_friendrequest(m->dht, m->friendlist[i].client_id, m->friendlist[i].friendrequest_nospam, m->friendlist[i].info,
                                         m->friendlist[i].info_size);
 
             if (fr >= 0) {
@@ -699,7 +707,7 @@ void doFriends(Messenger *m)
                 }
             }
 
-            IP_Port friendip = DHT_getfriendip(m->friendlist[i].client_id);
+            IP_Port friendip = DHT_getfriendip(m->dht, m->friendlist[i].client_id);
 
             switch (is_cryptoconnected(m->net_crypto, m->friendlist[i].crypt_connection_id)) {
                 case 0:
@@ -883,7 +891,7 @@ void doMessenger(Messenger *m)
 {
     networking_poll(m->net);
 
-    doDHT();
+    do_DHT(m->dht);
     do_net_crypto(m->net_crypto);
     doInbound(m);
     doFriends(m);
@@ -897,7 +905,7 @@ uint32_t Messenger_size(Messenger *m)
     return crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES
            + sizeof(uint32_t)                  // nospam
            + sizeof(uint32_t)                  // DHT size
-           + DHT_size()                        // DHT itself
+           + DHT_size(m->dht)                        // DHT itself
            + sizeof(uint32_t)                  // Friendlist size
            + sizeof(Friend) * m->numfriends    // Friendlist itself
            + sizeof(uint16_t)                  // Own nickname length
@@ -910,13 +918,13 @@ void Messenger_save(Messenger *m, uint8_t *data)
 {
     save_keys(m->net_crypto, data);
     data += crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES;
-    uint32_t nospam = get_nospam();
+    uint32_t nospam = get_nospam(&(m->fr));
     memcpy(data, &nospam, sizeof(nospam));
     data += sizeof(nospam);
-    uint32_t size = DHT_size();
+    uint32_t size = DHT_size(m->dht);
     memcpy(data, &size, sizeof(size));
     data += sizeof(size);
-    DHT_save(data);
+    DHT_save(m->dht, data);
     data += size;
     size = sizeof(Friend) * m->numfriends;
     memcpy(data, &size, sizeof(size));
@@ -943,7 +951,7 @@ int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
     data += crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES;
     uint32_t nospam;
     memcpy(&nospam, data, sizeof(nospam));
-    set_nospam(nospam);
+    set_nospam(&(m->fr), nospam);
     data += sizeof(nospam);
     uint32_t size;
     memcpy(&size, data, sizeof(size));
@@ -954,7 +962,7 @@ int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
 
     length -= size;
 
-    if (DHT_load(data, size) == -1)
+    if (DHT_load(m->dht, data, size) == -1)
         return -1;
 
     data += size;