1 files changed, 29 insertions, 25 deletions

diff --git a/toxcore/network.h b/toxcore/network.h
index 1f4b757c..15e1c0a4 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -92,12 +92,11 @@ typedef int sock_t;
 #endif
 #endif
 
-#define MAX_UDP_PACKET_SIZE 65507
+#define MAX_UDP_PACKET_SIZE 2048
 
 #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 for IPv4 addresses. */
 #define NET_PACKET_SEND_NODES_IPV6 4   /* Send nodes response packet ID for other addresses. */
 #define NET_PACKET_COOKIE_REQUEST  24  /* Cookie request packet */
 #define NET_PACKET_COOKIE_RESPONSE 25  /* Cookie response packet */
@@ -105,7 +104,6 @@ typedef int sock_t;
 #define NET_PACKET_CRYPTO_DATA     27  /* Crypto data packet */
 #define NET_PACKET_CRYPTO          32  /* Encrypted data packet ID. */
 #define NET_PACKET_LAN_DISCOVERY   33  /* LAN discovery packet ID. */
-#define NET_PACKET_GROUP_CHATS     48  /* Group chats packet ID. */
 
 /* See:  docs/Prevent_Tracking.txt and onion.{c, h} */
 #define NET_PACKET_ONION_SEND_INITIAL 128
@@ -135,8 +133,7 @@ typedef int sock_t;
 #define TCP_INET6 (AF_INET6 + 3)
 #define TCP_FAMILY (AF_INET6 + 4)
 
-typedef union __attribute__ ((__packed__))
-{
+typedef union {
     uint8_t uint8[4];
     uint16_t uint16[2];
     uint32_t uint32;
@@ -144,8 +141,7 @@ typedef union __attribute__ ((__packed__))
 }
 IP4;
 
-typedef union __attribute__ ((__packed__))
-{
+typedef union {
     uint8_t uint8[16];
     uint16_t uint16[8];
     uint32_t uint32[4];
@@ -154,8 +150,7 @@ typedef union __attribute__ ((__packed__))
 }
 IP6;
 
-typedef struct __attribute__ ((__packed__))
-{
+typedef struct {
     uint8_t family;
     union {
         IP4 ip4;
@@ -164,8 +159,7 @@ typedef struct __attribute__ ((__packed__))
 }
 IP;
 
-typedef struct __attribute__ ((__packed__)) __attribute__((gcc_struct))
-{
+typedef struct {
     IP ip;
     uint16_t port;
 }
@@ -185,10 +179,30 @@ IP_Port;
 /* ip_ntoa
  *   converts ip into a string
  *   uses a static buffer, so mustn't used multiple times in the same output
+ *
+ *   IPv6 addresses are enclosed into square brackets, i.e. "[IPv6]"
+ *   writes error message into the buffer on error
  */
 const char *ip_ntoa(const IP *ip);
 
 /*
+ * ip_parse_addr
+ *  parses IP structure into an address string
+ *
+ * input
+ *  ip: ip of AF_INET or AF_INET6 families
+ *  length: length of the address buffer
+ *          Must be at least INET_ADDRSTRLEN for AF_INET
+ *          and INET6_ADDRSTRLEN for AF_INET6
+ *
+ * output
+ *  address: dotted notation (IPv4: quad, IPv6: 16) or colon notation (IPv6)
+ *
+ * returns 1 on success, 0 on failure
+ */
+int ip_parse_addr(const IP *ip, char *address, size_t length);
+
+/*
  * addr_parse_ip
  *  directly parses the input into an IP structure
  *  tries IPv4 first, then IPv6
@@ -232,16 +246,6 @@ void ip_copy(IP *target, const IP *source);
 /* copies an ip_port structure */
 void ipport_copy(IP_Port *target, const IP_Port *source);
 
-
-/* packs IP into data, writes SIZE_IP bytes to data */
-void ip_pack(uint8_t *data, const IP *source);
-/* unpacks IP from data, reads SIZE_IP bytes from data */
-void ip_unpack(IP *target, const uint8_t *data);
-/* packs IP_Port into data, writes SIZE_IPPORT bytes to data */
-void ipport_pack(uint8_t *data, const IP_Port *source);
-/* unpacks IP_Port from data, reads SIZE_IPPORT bytes to data */
-void ipport_unpack(IP_Port *target, const uint8_t *data);
-
 /*
  * addr_resolve():
  *  uses getaddrinfo to resolve an address into an IP address
@@ -282,7 +286,7 @@ int addr_resolve_or_parse_ip(const char *address, IP *to, IP *extra);
  * Packet data is put into data.
  * Packet length is put into length.
  */
-typedef int (*packet_handler_callback)(void *object, IP_Port ip_port, const uint8_t *data, uint32_t len);
+typedef int (*packet_handler_callback)(void *object, IP_Port ip_port, const uint8_t *data, uint16_t len);
 
 typedef struct {
     packet_handler_callback function;
@@ -343,7 +347,7 @@ uint64_t current_time_monotonic(void);
 /* Basic network functions: */
 
 /* Function to send packet(data) of length length to ip_port. */
-int sendpacket(Networking_Core *net, IP_Port ip_port, const uint8_t *data, uint32_t length);
+int sendpacket(Networking_Core *net, IP_Port ip_port, const uint8_t *data, uint16_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);
@@ -356,8 +360,8 @@ void networking_poll(Networking_Core *net);
  * ip must be in network order EX: 127.0.0.1 = (7F000001).
  * port is in host byte order (this means don't worry about it).
  *
- *  return 0 if no problems.
- *  return -1 if there were problems.
+ * return Networking_Core object if no problems
+ * return NULL if there are problems.
  */
 Networking_Core *new_networking(IP ip, uint16_t port);