1 files changed, 80 insertions, 117 deletions

diff --git a/core/network.h b/core/network.h
index 8f88940c..fe0c48eb 100644
--- a/core/network.h
+++ b/core/network.h
@@ -1,6 +1,6 @@
 /* network.h
 * 
-* Functions for the core networking.
+* Datatypes, functions and includes for the core networking.
 * 
  
     Copyright (C) 2013 Tox project All Rights Reserved.
@@ -21,81 +21,94 @@
     along with Tox.  If not, see <http://www.gnu.org/licenses/>.
     
 */
+ 
+
+#ifndef NETWORK_H 
+#define NETWORK_H 
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <time.h>
+
+
+
+#ifdef WIN32 /* Put win32 includes here */
+
+#include <winsock2.h>
+#include <windows.h>
+
+#undef VANILLA_NACL /* make sure on windows we use libsodium */
+
+#else //Linux includes
+
+#include <fcntl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <errno.h>
+#include <sys/time.h>
 
-#include "network.h"
 
+#endif
 
-/* returns current UNIX time in microseconds (us). */
-uint64_t current_time()
+#ifndef VANILLA_NACL
+/* we use libsodium by default */
+#include <sodium.h>
+#else
+
+/* TODO: Including stuff like this is bad. This needs fixing.
+   We keep support for the original NaCl for now. */
+#include "../nacl/build/Linux/include/amd64/crypto_box.h"
+
+#endif
+
+
+#define MAX_UDP_PACKET_SIZE 65507
+
+typedef union
 {
-    uint64_t time;
-    #ifdef WIN32
-    /* This probably works fine */
-    FILETIME ft;
-    GetSystemTimeAsFileTime(&ft);
-    time = ft.dwHighDateTime;
-    time <<=32;
-    time |= ft.dwLowDateTime;
-    time -= 116444736000000000UL;
-    return time/10;
-    #else
-    struct timeval a;
-    gettimeofday(&a, NULL);
-    time = 1000000UL*a.tv_sec + a.tv_usec;
-    return time;
+    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
+{
+    int16_t family;
+    uint16_t port;
+    IP ip;
+    uint8_t zeroes[8];
+    #ifdef ENABLE_IPV6
+    uint8_t zeroes2[12];
     #endif
-    
-    
-}
+}ADDR;
+
+
+/* returns current time in milleseconds since the epoch. */
+uint64_t current_time();
 
 /* return a random number
    NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary */
-uint32_t random_int()
-{
-    #ifndef VANILLA_NACL
-    /* NOTE: this function comes from libsodium */
-    return randombytes_random();
-    #else
-    return random();
-    #endif
-}
+uint32_t random_int();
 
-/* our UDP socket, a global variable. */
-static int sock;
+/* Basic network functions: */
 
-/* Basic network functions:
-   Function to send packet(data) of length length to ip_port */
-int sendpacket(IP_Port ip_port, uint8_t * data, uint32_t length)
-{
-    ADDR addr = {AF_INET, ip_port.port, ip_port.ip}; 
-    return sendto(sock,(char *) data, length, 0, (struct sockaddr *)&addr, sizeof(addr));
-    
-}
+/* Function to send packet(data) of length length to ip_port */
+int sendpacket(IP_Port ip_port, uint8_t * data, uint32_t length);
 
 /* Function to receive data, ip and port of sender is put into ip_port
    the packet data into data
-   the packet length into length.
-   dump all empty packets. */
-int receivepacket(IP_Port * ip_port, uint8_t * data, uint32_t * length)
-{
-    ADDR addr;
-    #ifdef WIN32
-    int addrlen = sizeof(addr);
-    #else
-    uint32_t addrlen = sizeof(addr);
-    #endif    
-    (*(int32_t *)length) = recvfrom(sock,(char *) data, MAX_UDP_PACKET_SIZE, 0, (struct sockaddr *)&addr, &addrlen);
-    if(*(int32_t *)length <= 0)
-    {
-        /* nothing received
-           or empty packet */
-        return -1;
-    }
-    ip_port->ip = addr.ip;
-    ip_port->port = addr.port;
-    return 0;
-    
-}
+   the packet length into length. */
+int receivepacket(IP_Port * ip_port, uint8_t * data, uint32_t * length);
 
 /* initialize networking
    bind to ip and port
@@ -103,59 +116,9 @@ int receivepacket(IP_Port * ip_port, uint8_t * data, uint32_t * length)
    port is in host byte order (this means don't worry about it)
    returns 0 if no problems
    TODO: add something to check if there are errors */
-int init_networking(IP ip ,uint16_t port)
-{
-    #ifdef WIN32
-    WSADATA wsaData;
-    if(WSAStartup(MAKEWORD(2,2), &wsaData) != NO_ERROR)
-    {
-        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); 
-    
-    /* Functions to increase the size of the send and receive UDP buffers
-       NOTE: uncomment if necessary
-    
-    int n = 1024 * 1024 * 2;
-    if(setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char*)&n, sizeof(n)) == -1)
-    {
-        return -1;
-    }
-
-    if(setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char*)&n, sizeof(n)) == -1)
-    {
-        return -1;
-    }*/
-    
-    /*Set socket nonblocking */
-    #ifdef WIN32
-    /* I think this works for windows */
-    u_long mode = 1;
-    /* ioctl(sock, FIONBIO, &mode); */
-    ioctlsocket(sock, FIONBIO, &mode); 
-    #else
-    fcntl(sock, F_SETFL, O_NONBLOCK, 1);
-    #endif
-    
-    /* Bind our socket to port PORT and address 0.0.0.0 */
-    ADDR addr = {AF_INET, htons(port), ip}; 
-    bind(sock, (struct sockaddr*)&addr, sizeof(addr));   
-    return 0;
+int init_networking(IP ip ,uint16_t port);
 
-}
 
-/* function to cleanup networking stuff */
-void shutdown_networking()
-{
-    #ifdef WIN32
-    WSACleanup();
-    #endif
-    return;
-}
+/* function to cleanup networking stuff(doesn't do much right now) */
+void shutdown_networking();
+#endif