Merge branch 'master' into Jeffail-master

Conflicts:
	core/DHT.c

1 files changed, 32 insertions, 19 deletions

diff --git a/core/DHT.c b/core/DHT.c
index 5a362ecc..f779ef18 100644
--- a/core/DHT.c
+++ b/core/DHT.c
@@ -85,7 +85,7 @@ typedef struct {
     uint8_t     hole_punching; 
     uint32_t    punching_index;
     uint32_t    punching_timestamp;
-    uint32_t    recvNATping_timestamp;
+    int64_t     recvNATping_timestamp;
     uint64_t    NATping_id;
     uint32_t    NATping_timestamp;
 } Friend;
@@ -98,7 +98,7 @@ typedef struct {
 typedef struct {
     IP_Port     ip_port;
     uint64_t    ping_id;
-    uint32_t    timestamp;
+    int64_t     timestamp;
 } Pinged;
 
 /*----------------------------------------------------------------------------------*/
@@ -145,7 +145,8 @@ int id_closest(uint8_t * client_id, uint8_t * client_id1, uint8_t * client_id2)
  */
 int client_in_list(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port)
 {
-    uint32_t i, temp_time = unix_time();
+    uint32_t i;
+    int64_t temp_time = unix_time();
 
     for(i = 0; i < length; ++i) {
         /*If ip_port is assigned to a different client_id replace it*/
@@ -197,7 +198,8 @@ static int friend_number(uint8_t * client_id)
  */
 int get_close_nodes(uint8_t * client_id, Node_format * nodes_list)
 {
-    uint32_t    i, j, k, temp_time = unix_time();
+    uint32_t    i, j, k;
+    int64_t     temp_time = unix_time();
     int         num_nodes = 0, closest, tout, inlist;
 
     for (i = 0; i < LCLIENT_LIST; ++i) {
@@ -283,7 +285,7 @@ int replace_bad(    Client_data *   list,
                     IP_Port         ip_port )
 {
     uint32_t i;
-    uint32_t temp_time = unix_time();
+    int64_t temp_time = unix_time();
     for(i = 0; i < length; ++i) {
         /* if node is bad */
         if(list[i].timestamp + BAD_NODE_TIMEOUT < temp_time) {
@@ -308,7 +310,7 @@ int replace_good(   Client_data *   list,
                     uint8_t *       comp_client_id )
 {
     uint32_t i;
-    uint32_t temp_time = unix_time();
+    int64_t temp_time = unix_time();
 
     for(i = 0; i < length; ++i)
         if(id_closest(comp_client_id, list[i].client_id, client_id) == 2) {
@@ -371,7 +373,8 @@ void addto_lists(IP_Port ip_port, uint8_t * client_id)
  */
 void returnedip_ports(IP_Port ip_port, uint8_t * client_id, uint8_t * nodeclient_id)
 {
-    uint32_t i, j, temp_time = unix_time();
+    uint32_t i, j;
+    int64_t temp_time = unix_time();
 
     if (memcmp(client_id, self_public_key, CLIENT_ID_SIZE) == 0) {
         for (i = 0; i < LCLIENT_LIST; ++i) {
@@ -411,8 +414,9 @@ void returnedip_ports(IP_Port ip_port, uint8_t * client_id, uint8_t * nodeclient
  */
 int is_pinging(IP_Port ip_port, uint64_t ping_id)
 {
-    uint32_t i, temp_time = unix_time();
+    uint32_t i;
     uint8_t pinging;
+    int64_t temp_time = unix_time();
 
     for (i = 0; i < LPING_ARRAY; ++i ) {
         if ((pings[i].timestamp + PING_TIMEOUT) > temp_time) {
@@ -434,8 +438,9 @@ int is_pinging(IP_Port ip_port, uint64_t ping_id)
 /* Same as last function but for get_node requests. */
 int is_gettingnodes(IP_Port ip_port, uint64_t ping_id)
 {
-    uint32_t i, temp_time = unix_time();
+    uint32_t i;
     uint8_t pinging;
+    int64_t temp_time = unix_time();
 
     for(i = 0; i < LSEND_NODES_ARRAY; ++i ) {
         if((send_nodes[i].timestamp + PING_TIMEOUT) > temp_time) {
@@ -462,8 +467,10 @@ int is_gettingnodes(IP_Port ip_port, uint64_t ping_id)
  */
 uint64_t add_pinging(IP_Port ip_port)
 {
-    uint32_t i, j, temp_time = unix_time();
+    uint32_t i, j;
     uint64_t ping_id = ((uint64_t)random_int() << 32) + random_int();
+    int64_t temp_time = unix_time();
+
 
     for(i = 0; i < PING_TIMEOUT; ++i ) {
         for(j = 0; j < LPING_ARRAY; ++j ) {
@@ -484,7 +491,7 @@ uint64_t add_gettingnodes(IP_Port ip_port)
 {
     uint32_t i, j;
     uint64_t ping_id = ((uint64_t)random_int() << 32) + random_int();
-    uint32_t temp_time = unix_time();
+    int64_t temp_time = unix_time();
 
     for(i = 0; i < PING_TIMEOUT; ++i ) {
         for(j = 0; j < LSEND_NODES_ARRAY; ++j ) {
@@ -823,7 +830,8 @@ int DHT_delfriend(uint8_t * client_id)
 /* TODO: Optimize this. */
 IP_Port DHT_getfriendip(uint8_t * client_id)
 {
-    uint32_t i, j, temp_time = unix_time();
+    uint32_t i, j;
+    int64_t temp_time = unix_time();
     IP_Port empty = {{{0}}, 0};
 
     for (i = 0; i < num_friends; ++i) {
@@ -849,7 +857,7 @@ IP_Port DHT_getfriendip(uint8_t * client_id)
 void doDHTFriends()
 {
     uint32_t i, j;
-    uint32_t temp_time = unix_time();
+    int64_t temp_time = unix_time();
     uint32_t rand_node;
     uint32_t index[MAX_FRIEND_CLIENTS];
 
@@ -888,7 +896,7 @@ static uint32_t close_lastgetnodes;
 void doClose()
 {
     uint32_t i;
-    uint32_t temp_time = unix_time();
+    int64_t temp_time = unix_time();
     uint32_t num_nodes = 0;
     uint32_t rand_node;
     uint32_t index[LCLIENT_LIST];
@@ -945,8 +953,9 @@ int route_packet(uint8_t * client_id, uint8_t * packet, uint32_t length)
 static int friend_iplist(IP_Port * ip_portlist, uint16_t friend_num)
 {
     int num_ips = 0;
-    uint32_t i, temp_time = unix_time();
-
+    uint32_t i;
+    int64_t temp_time = unix_time();
+    
     if (friend_num >= num_friends)
         return -1;
 
@@ -979,7 +988,8 @@ int route_tofriend(uint8_t * friend_id, uint8_t * packet, uint32_t length)
     if (num == -1)
         return 0;
 
-    uint32_t i, sent = 0, temp_time = unix_time();
+    uint32_t i, sent = 0;
+    int64_t temp_time = unix_time();
     Friend * friend = &friends_list[num];
     Client_data * client;
 
@@ -1012,6 +1022,7 @@ int routeone_tofriend(uint8_t * friend_id, uint8_t * packet, uint32_t length)
     IP_Port ip_list[MAX_FRIEND_CLIENTS];
     int n = 0;
     uint32_t i, temp_time = unix_time();
+    int64_t temp_time = unix_time();
 
     for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) {
         client = &friend->client_list[i];
@@ -1184,7 +1195,8 @@ static void punch_holes(IP ip, uint16_t * port_list, uint16_t numports, uint16_t
 
 static void doNAT()
 {
-    uint32_t i, temp_time = unix_time();
+    uint32_t i;
+    int64_t temp_time = unix_time();
 
     for (i = 0; i < num_friends; ++i) {
         IP_Port ip_list[MAX_FRIEND_CLIENTS];
@@ -1279,7 +1291,7 @@ int DHT_load(uint8_t * data, uint32_t size)
 
     uint32_t i, j;
     uint16_t temp;
-    /* uint32_t temp_time = unix_time(); */
+    /* int64_t temp_time = unix_time(); */
 
     Client_data * client;
 
@@ -1314,6 +1326,7 @@ int DHT_load(uint8_t * data, uint32_t size)
 int DHT_isconnected()
 {
     uint32_t i, temp_time = unix_time();
+    int64_t temp_time = unix_time();
 
     for(i = 0; i < LCLIENT_LIST; ++i) {
         if(close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time)