Avoid casting back and forth between void-ptr.

In windows network code, we implement inet_pton and inet_ntop, which take
void pointers. We can do slightly better because we already know the type
when we call these functions, so we can avoid casting between void
pointer and the addr struct types.

3 files changed, 62 insertions, 14 deletions

diff --git a/toxav/toxav.c b/toxav/toxav.c
index ba27fe27..597d7bea 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -131,7 +131,9 @@ ToxAV *toxav_new(Tox *tox, Toxav_Err_New *error)
 
     // TODO(iphydf): Don't rely on toxcore internals.
     Messenger *m;
+    //!TOKSTYLE-
     m = *(Messenger **)tox;
+    //!TOKSTYLE+
 
     if (m->msi_packet) {
         rc = TOXAV_ERR_NEW_MULTIPLE;
diff --git a/toxav/toxav_old.c b/toxav/toxav_old.c
index e5cfbadc..9ccd1365 100644
--- a/toxav/toxav_old.c
+++ b/toxav/toxav_old.c
@@ -24,7 +24,9 @@
 int toxav_add_av_groupchat(Tox *tox, audio_data_cb *audio_callback, void *userdata)
 {
     // TODO(iphydf): Don't rely on toxcore internals.
+    //!TOKSTYLE-
     Messenger *m = *(Messenger **)tox;
+    //!TOKSTYLE+
     return add_av_groupchat(m->log, tox, m->conferences_object, audio_callback, userdata);
 }
 
@@ -42,7 +44,9 @@ int toxav_join_av_groupchat(Tox *tox, uint32_t friendnumber, const uint8_t *data
                             audio_data_cb *audio_callback, void *userdata)
 {
     // TODO(iphydf): Don't rely on toxcore internals.
+    //!TOKSTYLE-
     Messenger *m = *(Messenger **)tox;
+    //!TOKSTYLE+
     return join_av_groupchat(m->log, tox, m->conferences_object, friendnumber, data, length, audio_callback, userdata);
 }
 
@@ -63,7 +67,9 @@ int toxav_group_send_audio(Tox *tox, uint32_t groupnumber, const int16_t *pcm, u
                            uint32_t sample_rate)
 {
     // TODO(iphydf): Don't rely on toxcore internals.
+    //!TOKSTYLE-
     Messenger *m = *(Messenger **)tox;
+    //!TOKSTYLE+
     return group_send_audio(m->conferences_object, groupnumber, pcm, samples, channels, sample_rate);
 }
 
@@ -88,7 +94,9 @@ int toxav_group_send_audio(Tox *tox, uint32_t groupnumber, const int16_t *pcm, u
 int toxav_groupchat_enable_av(Tox *tox, uint32_t groupnumber, audio_data_cb *audio_callback, void *userdata)
 {
     // TODO(iphydf): Don't rely on toxcore internals.
+    //!TOKSTYLE-
     Messenger *m = *(Messenger **)tox;
+    //!TOKSTYLE+
     return groupchat_enable_av(m->log, tox, m->conferences_object, groupnumber, audio_callback, userdata);
 }
 
@@ -100,7 +108,9 @@ int toxav_groupchat_enable_av(Tox *tox, uint32_t groupnumber, audio_data_cb *aud
 int toxav_groupchat_disable_av(Tox *tox, uint32_t groupnumber)
 {
     // TODO(iphydf): Don't rely on toxcore internals.
+    //!TOKSTYLE-
     Messenger *m = *(Messenger **)tox;
+    //!TOKSTYLE+
     return groupchat_disable_av(m->conferences_object, groupnumber);
 }
 
@@ -109,6 +119,8 @@ int toxav_groupchat_disable_av(Tox *tox, uint32_t groupnumber)
 bool toxav_groupchat_av_enabled(Tox *tox, uint32_t groupnumber)
 {
     // TODO(iphydf): Don't rely on toxcore internals.
+    //!TOKSTYLE-
     Messenger *m = *(Messenger **)tox;
+    //!TOKSTYLE+
     return groupchat_av_enabled(m->conferences_object, groupnumber);
 }
diff --git a/toxcore/network.c b/toxcore/network.c
index 67122ea3..d6d5bfd4 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -83,6 +83,26 @@
 
 #define TOX_EWOULDBLOCK EWOULDBLOCK
 
+static const char *inet_ntop4(int family, const struct in_addr *addr, char *buf, size_t bufsize)
+{
+    return inet_ntop(family, addr, buf, bufsize);
+}
+
+static const char *inet_ntop6(int family, const struct in6_addr *addr, char *buf, size_t bufsize)
+{
+    return inet_ntop(family, addr, buf, bufsize);
+}
+
+static int inet_pton4(int family, const char *addrString, struct in_addr *addrbuf)
+{
+    return inet_pton(family, addrString, addrbuf);
+}
+
+static int inet_pton6(int family, const char *addrString, struct in6_addr *addrbuf)
+{
+    return inet_pton(family, addrString, addrbuf);
+}
+
 #else
 #ifndef IPV6_V6ONLY
 #define IPV6_V6ONLY 27
@@ -90,14 +110,14 @@
 
 #define TOX_EWOULDBLOCK WSAEWOULDBLOCK
 
-static const char *inet_ntop(int family, const void *addr, char *buf, size_t bufsize)
+static const char *inet_ntop4(int family, const struct in_addr *addr, char *buf, size_t bufsize)
 {
     if (family == AF_INET) {
         struct sockaddr_in saddr;
         memset(&saddr, 0, sizeof(saddr));
 
         saddr.sin_family = AF_INET;
-        saddr.sin_addr = *(const struct in_addr *)addr;
+        saddr.sin_addr = *addr;
 
         DWORD len = bufsize;
 
@@ -106,12 +126,19 @@ static const char *inet_ntop(int family, const void *addr, char *buf, size_t buf
         }
 
         return buf;
-    } else if (family == AF_INET6) {
+    }
+
+    return nullptr;
+}
+
+static const char *inet_ntop6(int family, const struct in6_addr *addr, char *buf, size_t bufsize)
+{
+    if (family == AF_INET6) {
         struct sockaddr_in6 saddr;
         memset(&saddr, 0, sizeof(saddr));
 
         saddr.sin6_family = AF_INET6;
-        saddr.sin6_addr = *(const struct in6_addr *)addr;
+        saddr.sin6_addr = *addr;
 
         DWORD len = bufsize;
 
@@ -125,7 +152,7 @@ static const char *inet_ntop(int family, const void *addr, char *buf, size_t buf
     return nullptr;
 }
 
-static int inet_pton(int family, const char *addrString, void *addrbuf)
+static int inet_pton4(int family, const char *addrString, struct in_addr *addrbuf)
 {
     if (family == AF_INET) {
         struct sockaddr_in saddr;
@@ -137,10 +164,17 @@ static int inet_pton(int family, const char *addrString, void *addrbuf)
             return 0;
         }
 
-        *(struct in_addr *)addrbuf = saddr.sin_addr;
+        *addrbuf = saddr.sin_addr;
 
         return 1;
-    } else if (family == AF_INET6) {
+    }
+
+    return 0;
+}
+
+static int inet_pton6(int family, const char *addrString, struct in6_addr *addrbuf)
+{
+    if (family == AF_INET6) {
         struct sockaddr_in6 saddr;
         memset(&saddr, 0, sizeof(saddr));
 
@@ -150,7 +184,7 @@ static int inet_pton(int family, const char *addrString, void *addrbuf)
             return 0;
         }
 
-        *(struct in6_addr *)addrbuf = saddr.sin6_addr;
+        *addrbuf = saddr.sin6_addr;
 
         return 1;
     }
@@ -1085,14 +1119,14 @@ const char *ip_ntoa(const IP *ip, char *ip_str, size_t length)
             fill_addr4(ip->ip.v4, &addr);
 
             ip_str[0] = 0;
-            inet_ntop(family, &addr, ip_str, length);
+            inet_ntop4(family, &addr, ip_str, length);
         } else if (net_family_is_ipv6(ip->family)) {
             /* returns hex-groups enclosed into square brackets */
             struct in6_addr addr;
             fill_addr6(ip->ip.v6, &addr);
 
             ip_str[0] = '[';
-            inet_ntop(family, &addr, &ip_str[1], length - 3);
+            inet_ntop6(family, &addr, &ip_str[1], length - 3);
             size_t len = strlen(ip_str);
             ip_str[len] = ']';
             ip_str[len + 1] = 0;
@@ -1116,12 +1150,12 @@ bool ip_parse_addr(const IP *ip, char *address, size_t length)
 
     if (net_family_is_ipv4(ip->family)) {
         const struct in_addr *addr = (const struct in_addr *)&ip->ip.v4;
-        return inet_ntop(make_family(ip->family), addr, address, length) != nullptr;
+        return inet_ntop4(make_family(ip->family), addr, address, length) != nullptr;
     }
 
     if (net_family_is_ipv6(ip->family)) {
         const struct in6_addr *addr = (const struct in6_addr *)&ip->ip.v6;
-        return inet_ntop(make_family(ip->family), addr, address, length) != nullptr;
+        return inet_ntop6(make_family(ip->family), addr, address, length) != nullptr;
     }
 
     return false;
@@ -1135,7 +1169,7 @@ bool addr_parse_ip(const char *address, IP *to)
 
     struct in_addr addr4;
 
-    if (inet_pton(AF_INET, address, &addr4) == 1) {
+    if (inet_pton4(AF_INET, address, &addr4) == 1) {
         to->family = net_family_ipv4;
         get_ip4(&to->ip.v4, &addr4);
         return true;
@@ -1143,7 +1177,7 @@ bool addr_parse_ip(const char *address, IP *to)
 
     struct in6_addr addr6;
 
-    if (inet_pton(AF_INET6, address, &addr6) == 1) {
+    if (inet_pton6(AF_INET6, address, &addr6) == 1) {
         to->family = net_family_ipv6;
         get_ip6(&to->ip.v6, &addr6);
         return true;