Removed packet structs.

They were causing problems on certain compiler configurations.

1 files changed, 7 insertions, 8 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 0e0ead52..937e6196 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -24,7 +24,6 @@
 /*----------------------------------------------------------------------------------*/
 
 #include "DHT.h"
-#include "packets.h"
 #include "ping.h"
 
 /* The number of seconds for a non responsive node to become bad. */
@@ -563,7 +562,7 @@ static int handle_getnodes(void *object, IP_Port source, uint8_t *packet, uint32
     memcpy(&ping_id, plain, sizeof(ping_id));
     sendnodes(dht, source, packet + 1, plain + sizeof(ping_id), ping_id);
 
-    // send_ping_request(dht, source, (clientid_t*) (packet + 1)); /* TODO: make this smarter? */
+    //send_ping_request(dht, source, packet + 1); /* TODO: make this smarter? */
 
     return 0;
 }
@@ -606,7 +605,7 @@ static int handle_sendnodes(void *object, IP_Port source, uint8_t *packet, uint3
     uint32_t i;
 
     for (i = 0; i < num_nodes; ++i)  {
-        send_ping_request(dht->ping, dht->c, nodes_list[i].ip_port, (clientid_t *) &nodes_list[i].client_id);
+        send_ping_request(dht->ping, dht->c, nodes_list[i].ip_port, nodes_list[i].client_id);
         returnedip_ports(dht, nodes_list[i].ip_port, nodes_list[i].client_id, packet + 1);
     }
 
@@ -713,7 +712,7 @@ static void do_DHT_friends(DHT *dht)
             if (!is_timeout(temp_time, dht->friends_list[i].client_list[j].timestamp, Kill_NODE_TIMEOUT)) {
                 if ((dht->friends_list[i].client_list[j].last_pinged + PING_INTERVAL) <= temp_time) {
                     send_ping_request(dht->ping, dht->c, dht->friends_list[i].client_list[j].ip_port,
-                                      (clientid_t *) &dht->friends_list[i].client_list[j].client_id );
+                                      dht->friends_list[i].client_list[j].client_id );
                     dht->friends_list[i].client_list[j].last_pinged = temp_time;
                 }
 
@@ -751,7 +750,7 @@ static void do_Close(DHT *dht)
         if (!is_timeout(temp_time, dht->close_clientlist[i].timestamp, Kill_NODE_TIMEOUT)) {
             if ((dht->close_clientlist[i].last_pinged + PING_INTERVAL) <= temp_time) {
                 send_ping_request(dht->ping, dht->c, dht->close_clientlist[i].ip_port,
-                                  (clientid_t *) &dht->close_clientlist[i].client_id );
+                                  dht->close_clientlist[i].client_id );
                 dht->close_clientlist[i].last_pinged = temp_time;
             }
 
@@ -775,7 +774,7 @@ static void do_Close(DHT *dht)
 void DHT_bootstrap(DHT *dht, IP_Port ip_port, uint8_t *public_key)
 {
     getnodes(dht, ip_port, public_key, dht->c->self_public_key);
-    send_ping_request(dht->ping, dht->c, ip_port, (clientid_t *) public_key);
+    send_ping_request(dht->ping, dht->c, ip_port, public_key);
 }
 
 /* Send the given packet to node with client_id
@@ -1042,7 +1041,7 @@ static void punch_holes(DHT *dht, IP ip, uint16_t *port_list, uint16_t numports,
         /* TODO: improve port guessing algorithm */
         uint16_t port = port_list[(i / 2) % numports] + (i / (2 * numports)) * ((i % 2) ? -1 : 1);
         IP_Port pinging = {ip, htons(port)};
-        send_ping_request(dht->ping, dht->c, pinging, (clientid_t *) &dht->friends_list[friend_num].client_id);
+        send_ping_request(dht->ping, dht->c, pinging, dht->friends_list[friend_num].client_id);
     }
 
     dht->friends_list[friend_num].punching_index = i;
@@ -1143,7 +1142,7 @@ static void do_toping(DHT *dht)
         if (dht->toping[i].ip_port.ip.i == 0)
             return;
 
-        send_ping_request(dht->ping, dht->c, dht->toping[i].ip_port, (clientid_t *) dht->toping[i].client_id);
+        send_ping_request(dht->ping, dht->c, dht->toping[i].ip_port, dht->toping[i].client_id);
         dht->toping[i].ip_port.ip.i = 0;
     }
 }