1 files changed, 8 insertions, 5 deletions

diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 6b0e56fc..c049aa18 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -7,7 +7,7 @@
  * If it recieves a message from a friend it replies back.
  * 
  * 
- * This is how I compile it: gcc -O2 -Wall -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/DHT.c ../core/Messenger.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/* Messenger_test.c
+ * 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 and port of a node (for bootstrapping).
@@ -77,8 +77,8 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length)
 
 int main(int argc, char *argv[])
 {
-    if (argc < 3) {
-        printf("usage %s ip port (of the DHT bootstrap node)\n", argv[0]);
+    if (argc < 4) {
+        printf("usage %s ip port public_key (of the DHT bootstrap node)\n", argv[0]);
         exit(0);
     }
     initMessenger();
@@ -96,14 +96,17 @@ int main(int argc, char *argv[])
     
     char temp_id[128];
     printf("\nEnter the client_id of the friend you wish to add (32 bytes HEX format):\n");
-    scanf("%s", temp_id);
+    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"));
     
     perror("Initialization");
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     bootstrap_ip_port.ip.i = inet_addr(argv[1]);
-    DHT_bootstrap(bootstrap_ip_port);
+    DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
     
     while(1)
     {