1 files changed, 9 insertions, 65 deletions

diff --git a/core/DHT.h b/core/DHT.h
index c35b17d5..edd4236a 100644
--- a/core/DHT.h
+++ b/core/DHT.h
@@ -1,25 +1,14 @@
-#ifndef DHT_H 
-#define DHT_H 
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <time.h>
+/* DHT.h
+* 
+* An implementation of the DHT as seen in docs/DHT.txt
+* 
+*/
 
-#ifdef WIN32 //Put win32 includes here
 
-#include <winsock2.h>
-#include <windows.h>
-
-#else //Linux includes
-
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
+#ifndef DHT_H 
+#define DHT_H 
 
-#endif
+#include "network.h"
 
 //Current time, unix format
 #define unix_time() ((uint32_t)time(NULL))
@@ -27,24 +16,6 @@
 //size of the client_id in bytes
 #define CLIENT_ID_SIZE 32
 
-#define MAX_UDP_PACKET_SIZE 65507
-
-typedef union
-{
-    uint8_t c[4];
-    uint16_t s[2];
-    uint32_t i;
-}IP;
-
-typedef struct
-{
-    IP ip;
-    uint16_t port;
-    //not used for anything right now
-    uint16_t padding; 
-}IP_Port;
-
-
 typedef struct
 {
     char client_id[CLIENT_ID_SIZE];
@@ -77,19 +48,6 @@ typedef struct
 }Pinged;
 
 
-typedef struct
-{
-    int16_t family;
-    uint16_t port;
-    IP ip;
-    uint8_t zeroes[8];
-    #ifdef ENABLE_IPV6
-    uint8_t zeroes2[12];
-    #endif
-}ADDR;
-
-
-
 //Add a new friend to the friends list
 //client_id must be CLIENT_ID_SIZE bytes long.
 //returns 0 if success
@@ -133,11 +91,8 @@ void bootstrap(IP_Port ip_port);
 //Global variables
 
 //Our client id
-char self_client_id[CLIENT_ID_SIZE];
+extern char self_client_id[CLIENT_ID_SIZE];
 
-//Our UDP socket.
-//We only use one so it's much easier to have it as a global variable
-int sock;
 
 //TODO: Move these out of here and put them into the .c file.
 //A list of the clients mathematically closest to ours.
@@ -162,15 +117,4 @@ Pinged pings[LPING_ARRAY];
 Pinged send_nodes[LSEND_NODES_ARRAY];
 
 
-//Basic network functions:
-//TODO: put them somewhere else than here
-
-//Function to send packet(data) of length length to ip_port
-int sendpacket(IP_Port ip_port, char * data, uint32_t length);
-
-//Function to recieve data, ip and port of sender is put into ip_port
-//the packet data into data
-//the packet length into length.
-int recievepacket(IP_Port * ip_port, char * data, uint32_t * length);
-
 #endif 
\ No newline at end of file