1 files changed, 77 insertions, 23 deletions

diff --git a/toxcore/network.h b/toxcore/network.h
index 2d08e88d..e804379d 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -39,17 +39,22 @@
 #include <windows.h>
 #include <ws2tcpip.h>
 
+typedef unsigned int sock_t;
+
 #else // Linux includes
 
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <unistd.h>
 
+typedef int sock_t;
+
 #endif
 
 #ifndef VANILLA_NACL
@@ -66,7 +71,8 @@
 #define NET_PACKET_PING_REQUEST    0   /* Ping request packet ID. */
 #define NET_PACKET_PING_RESPONSE   1   /* Ping response packet ID. */
 #define NET_PACKET_GET_NODES       2   /* Get nodes request packet ID. */
-#define NET_PACKET_SEND_NODES      3   /* Send nodes response packet ID. */
+#define NET_PACKET_SEND_NODES      3   /* Send nodes response packet ID for IPv4 addresses. */
+#define NET_PACKET_SEND_NODES_EX   4   /* Send nodes response packet ID for other addresses. */
 #define NET_PACKET_HANDSHAKE       16  /* Handshake packet ID. */
 #define NET_PACKET_SYNC            17  /* SYNC packet ID. */
 #define NET_PACKET_DATA            18  /* Data packet ID. */
@@ -82,27 +88,83 @@ typedef union {
     uint8_t uint8[4];
     uint16_t uint16[2];
     uint32_t uint32;
-} IP;
+    struct in_addr in_addr;
+} IP4;
+
+typedef struct in6_addr IP6;
+
+typedef struct {
+    sa_family_t family;
+    union {
+        IP4 ip4;
+        IP6 ip6;
+    };
+} IPAny;
 
 typedef union {
     struct {
-        IP ip;
+        IP4 ip;
         uint16_t port;
         /* Not used for anything right now. */
         uint16_t padding;
     };
     uint8_t uint8[8];
-} IP_Port;
+} IP4_Port;
 
+/* will replace IP_Port as soon as the complete infrastructure is in place
+ * removed the unused union and padding also */
 typedef struct {
-    int16_t family;
+    IPAny ip;
     uint16_t port;
-    IP ip;
-    uint8_t zeroes[8];
-#ifdef ENABLE_IPV6
-    uint8_t zeroes2[12];
+} IPAny_Port;
+
+#undef TOX_ENABLE_IPV6
+/* #define TOX_ENABLE_IPV6 */
+#ifdef TOX_ENABLE_IPV6
+#define TOX_ENABLE_IPV6_DEFAULT 1
+typedef IPAny IP;
+typedef IPAny_Port IP_Port;
+#else
+#define TOX_ENABLE_IPV6_DEFAULT 0
+typedef IP4 IP;
+typedef IP4_Port IP_Port;
 #endif
-} ADDR;
+
+/* ip_ntoa
+ *   converts ip into a string
+ *   uses a static buffer, so mustn't used multiple times in the same output
+ */
+const char *ip_ntoa(IP *ip);
+
+/* ipport_equal
+ *  compares two IPAny_Port structures
+ *  unset means unequal
+ *
+ * returns 0 when not equal or when uninitialized
+ */
+int ipport_equal(IP_Port *a, IP_Port *b);
+
+/* nulls out ip */
+void ip_reset(IP *ip);
+/* nulls out ip, sets family according to flag */
+void ip_init(IP *ip, uint8_t ipv6enabled);
+/* checks if ip is valid */
+int ip_isset(IP *ip);
+/* checks if ip is valid */
+int ipport_isset(IP_Port *ipport);
+/* copies an ip structure */
+void ip_copy(IP *target, IP *source);
+/* copies an ip_port structure */
+void ipport_copy(IP_Port *target, IP_Port *source);
+
+/*
+ * addr_resolve_or_parse_ip
+ *  resolves string into an IP address
+ *
+ * to->family MUST be set (AF_UNSPEC, AF_INET, AF_INET6)
+ * returns 1 on success, 0 on failure
+ */
+int addr_resolve_or_parse_ip(const char *address, IP *to);
 
 /* Function to receive data, ip and port of sender is put into ip_port.
  * Packet data is put into data.
@@ -117,13 +179,11 @@ typedef struct {
 
 typedef struct {
     Packet_Handles packethandlers[256];
-    /* Our UDP socket. */
-#ifdef WIN32
-    unsigned int sock;
-#else
-    int sock;
-#endif
 
+    /* Our UDP socket. */
+    sa_family_t family;
+    uint16_t port;
+    sock_t sock;
 } Networking_Core;
 
 /*  return current time in milleseconds since the epoch. */
@@ -137,12 +197,7 @@ uint32_t random_int(void);
 /* Basic network functions: */
 
 /* Function to send packet(data) of length length to ip_port. */
-#ifdef WIN32
-int sendpacket(unsigned int sock, IP_Port ip_port, uint8_t *data, uint32_t length);
-#else
-int sendpacket(int sock, IP_Port ip_port, uint8_t *data, uint32_t length);
-#endif
-
+int sendpacket(Networking_Core *net, IP_Port ip_port, uint8_t *data, uint32_t length);
 
 /* Function to call when packet beginning with byte is received. */
 void networking_registerhandler(Networking_Core *net, uint8_t byte, packet_handler_callback cb, void *object);
@@ -163,5 +218,4 @@ Networking_Core *new_networking(IP ip, uint16_t port);
 /* Function to cleanup networking stuff (doesn't do much right now). */
 void kill_networking(Networking_Core *net);
 
-
 #endif