3 files changed, 21 insertions, 4 deletions

diff --git a/core/network.c b/core/network.c
index 81da3f1b..a20b02f6 100644
--- a/core/network.c
+++ b/core/network.c
@@ -40,6 +40,16 @@ uint64_t current_time()
     
 }
 
+int random_int()
+{
+    #ifdef WIN32
+    //TODO replace rand with a more random windows function
+    return rand();
+    #else
+    return random();
+    #endif
+}
+
 //our UDP socket, a global variable.
 static int sock;
 
@@ -87,7 +97,11 @@ int init_networking(IP ip ,uint16_t port)
     {
         return -1;
     }
+    
+    #else
+    srandom((uint32_t)current_time());
     #endif
+    srand((uint32_t)current_time());
     
     //initialize our socket
     sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); 
diff --git a/core/network.h b/core/network.h
index 24f7281d..da92837d 100644
--- a/core/network.h
+++ b/core/network.h
@@ -79,6 +79,9 @@ typedef struct
 //returns current time in milleseconds since the epoch.
 uint64_t current_time();
 
+//return a random number
+int random_int();
+
 //Basic network functions:
 
 //Function to send packet(data) of length length to ip_port
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 799d31ad..4c1a9cd8 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -96,9 +96,6 @@ void printpacket(char * data, uint32_t length, IP_Port ip_port)
 
 int main(int argc, char *argv[])
 {
-    srand(time(NULL));
-    int randdomnum = rand();
-    memcpy(self_client_id, &randdomnum, 4);
     //memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
     
     if (argc < 4) {
@@ -107,12 +104,15 @@ int main(int argc, char *argv[])
     }
     addfriend(argv[3]);
     
-    
     //initialize networking
     //bind to ip 0.0.0.0:PORT
     IP ip;
     ip.i = 0;
     init_networking(ip, PORT);
+    
+    int randdomnum = random_int();
+    memcpy(self_client_id, &randdomnum, 4);
+    
 
     perror("Initialization");
     IP_Port bootstrap_ip_port;