Remove 'in_addr' and 'addrinfo' mention from network.h

2 files changed, 22 insertions, 35 deletions

diff --git a/toxcore/network.c b/toxcore/network.c
index 151986d9..aeaf4d79 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -166,6 +166,28 @@ static int make_socktype(int type);
 static int make_family(int tox_family);
 static int make_tox_family(int family);
 
+static void get_ip4(IP4 *result, const struct in_addr *addr)
+{
+    result->uint32 = addr->s_addr;
+}
+
+static void get_ip6(IP6 *result, const struct in6_addr *addr)
+{
+    assert(sizeof(result->uint8) == sizeof(addr->s6_addr));
+    memcpy(result->uint8, addr->s6_addr, sizeof(result->uint8));
+}
+
+static void fill_addr4(IP4 ip, struct in_addr *addr)
+{
+    addr->s_addr = ip.uint32;
+}
+
+static void fill_addr6(IP6 ip, struct in6_addr *addr)
+{
+    assert(sizeof(ip.uint8) == sizeof(addr->s6_addr));
+    memcpy(addr->s6_addr, ip.uint8, sizeof(ip.uint8));
+}
+
 /* Check if socket is valid.
  *
  * return 1 if valid
@@ -358,29 +380,6 @@ static void loglogdata(Logger *log, const char *message, const uint8_t *buffer,
     }
 }
 
-void get_ip4(IP4 *result, const struct in_addr *addr)
-{
-    result->uint32 = addr->s_addr;
-}
-
-void get_ip6(IP6 *result, const struct in6_addr *addr)
-{
-    assert(sizeof(result->uint8) == sizeof(addr->s6_addr));
-    memcpy(result->uint8, addr->s6_addr, sizeof(result->uint8));
-}
-
-
-void fill_addr4(IP4 ip, struct in_addr *addr)
-{
-    addr->s_addr = ip.uint32;
-}
-
-void fill_addr6(IP6 ip, struct in6_addr *addr)
-{
-    assert(sizeof(ip.uint8) == sizeof(addr->s6_addr));
-    memcpy(addr->s6_addr, ip.uint8, sizeof(ip.uint8));
-}
-
 /* Basic network functions:
  * Function to send packet(data) of length length to ip_port.
  */
diff --git a/toxcore/network.h b/toxcore/network.h
index f57c6897..3c98c168 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -63,10 +63,6 @@
 
 #endif
 
-struct in_addr;
-struct in6_addr;
-struct addrinfo;
-
 typedef short Family;
 
 typedef int Socket;
@@ -165,14 +161,6 @@ typedef struct {
 }
 IP_Port;
 
-/* Convert in_addr to IP */
-void get_ip4(IP4 *ip, const struct in_addr *addr);
-void get_ip6(IP6 *ip, const struct in6_addr *addr);
-
-/* Conevrt IP to in_addr */
-void fill_addr4(IP4 ip, struct in_addr *addr);
-void fill_addr6(IP6 ip, struct in6_addr *addr);
-
 /* Convert values between host and network byte order.
  */
 uint32_t net_htonl(uint32_t hostlong);