1 files changed, 45 insertions, 34 deletions

diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index a11d374b..51542c6d 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -1,21 +1,21 @@
 /* Messenger test
- * 
+ *
  * This program adds a friend and accepts all friend requests with the proper message.
- * 
+ *
  * It tries sending a message to the added friend.
- * 
+ *
  * If it receives a message from a friend it replies back.
- * 
- * 
+ *
+ *
  * This is how I compile it: gcc -O2 -Wall -D VANILLA_NACL -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../core/DHT.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/{cpucycles.o,libnacl.a,randombytes.o} Messenger_test.c
  *
- * 
+ *
  * Command line arguments are the ip, port and public_key of a node (for bootstrapping).
- * 
+ *
  * EX: ./test 127.0.0.1 33445 CDCFD319CE3460824B33BE58FD86B8941C9585181D8FBD7C79C5721D7C2E9F7C
- * 
+ *
  * Or the argument can be the path to the save file.
- * 
+ *
  * EX: ./test Save.bak
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -34,7 +34,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 
 #include "../core/Messenger.h"
@@ -51,6 +51,10 @@
 
 #endif
 
+/* FIXME needed as print_request has to match the interface expected by
+ * networking_requesthandler and so cannot take a Messenger * */
+static Messenger *m;
+
 void print_request(uint8_t * public_key, uint8_t * data, uint16_t length)
 {
     printf("Friend request received from: \n");
@@ -63,7 +67,7 @@ void print_request(uint8_t * public_key, uint8_t * data, uint16_t length)
         printf("%hhX", public_key[j]);
     }
     printf("\nOf length: %u with data: %s \n", length, data);
-    
+
     if(length != sizeof("Install Gentoo"))
     {
         return;
@@ -72,14 +76,14 @@ void print_request(uint8_t * public_key, uint8_t * data, uint16_t length)
     //if the request contained the message of peace the person is obviously a friend so we add him.
     {
         printf("Friend request accepted.\n");
-        m_addfriend_norequest(public_key);
+        m_addfriend_norequest(m, public_key);
     }
 }
 
-void print_message(int friendnumber, uint8_t * string, uint16_t length)
+void print_message(Messenger *m, int friendnumber, uint8_t * string, uint16_t length)
 {
     printf("Message with length %u received from %u: %s \n", length, friendnumber, string);
-    m_sendmessage(friendnumber, (uint8_t*)"Test1", 6);
+    m_sendmessage(m, friendnumber, (uint8_t*)"Test1", 6);
 }
 
 int main(int argc, char *argv[])
@@ -88,7 +92,13 @@ int main(int argc, char *argv[])
         printf("usage %s ip port public_key (of the DHT bootstrap node)\n or\n %s Save.bak\n", argv[0], argv[0]);
         exit(0);
     }
-    initMessenger();
+
+    m = initMessenger();
+    if( !m ){
+        fputs("Failed to allocate messenger datastructure\n", stderr);
+        exit(0);
+    }
+
     if(argc > 3) {
         IP_Port bootstrap_ip_port;
         bootstrap_ip_port.port = htons(atoi(argv[2]));
@@ -100,13 +110,13 @@ int main(int argc, char *argv[])
         int read;
         uint8_t buffer[128000];
         read = fread(buffer, 1, 128000, file);
-        printf("Messenger loaded: %i\n", Messenger_load(buffer, read));
+        printf("Messenger loaded: %i\n", Messenger_load(m, buffer, read));
         fclose(file);
-        
+
     }
-    m_callback_friendrequest(print_request);
-    m_callback_friendmessage(print_message);
-    
+    m_callback_friendrequest(m, print_request);
+    m_callback_friendmessage(m, print_message);
+
     printf("OUR ID: ");
     uint32_t i;
     for(i = 0; i < 32; i++) {
@@ -114,33 +124,34 @@ int main(int argc, char *argv[])
             printf("0");
         printf("%hhX",self_public_key[i]);
     }
-    
-    setname((uint8_t *)"Anon", 5);
-    
+
+    setname(m, (uint8_t *)"Anon", 5);
+
     char temp_id[128];
     printf("\nEnter the client_id of the friend you wish to add (32 bytes HEX format):\n");
     if(scanf("%s", temp_id) != 1) {
         return 1;
     }
-    int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
-    
+    int num = m_addfriend(m, hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
+
     perror("Initialization");
 
     while(1) {
         uint8_t name[128];
-        getname(num, name);
+        getname(m, num, name);
         printf("%s\n", name);
-        
-        m_sendmessage(num, (uint8_t*)"Test", 5);
-        doMessenger();
+
+        m_sendmessage(m, num, (uint8_t*)"Test", 5);
+        doMessenger(m);
         c_sleep(30);
         FILE *file = fopen("Save.bak", "wb");
         if ( file==NULL ){return 1;}
-        uint8_t * buffer = malloc(Messenger_size());
-        Messenger_save(buffer);
-        size_t write_result = fwrite(buffer, 1, Messenger_size(), file);
-        if (write_result < Messenger_size()) {return 1;}
+        uint8_t * buffer = malloc(Messenger_size(m));
+        Messenger_save(m, buffer);
+        size_t write_result = fwrite(buffer, 1, Messenger_size(m), file);
+        if (write_result < Messenger_size(m)) {return 1;}
         free(buffer);
         fclose(file);
-    }  
+    }
+    cleanupMessenger(m);
 }