Add MingW support.

1 files changed, 37 insertions, 43 deletions

diff --git a/src/inet.c b/src/inet.c
index 1017022..1530fef 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -385,7 +385,6 @@ const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm)
             struct in6_addr addrany = IN6ADDR_ANY_INIT; 
             memset((char *) &sin6, 0, sizeof(sin6));
             sin6.sin6_family = AF_UNSPEC;
-fprintf(stderr, "disconnecting\n");
             sin6.sin6_addr = addrany;
             return socket_strerror(socket_connect(ps, (SA *) &sin6, 
                 sizeof(sin6), tm));
@@ -507,54 +506,49 @@ int inet_aton(const char *cp, struct in_addr *inp)
 }
 #endif
 
-// inet_ntop/inet_pton for MinGW from http://mingw-users.1079350.n2.nabble.com/IPv6-getaddrinfo-amp-inet-ntop-td5891996.html
+/*-------------------------------------------------------------------------*\
+* inet_ntop/inet_pton for MinGW from 
+* http://mingw-users.1079350.n2.nabble.com/IPv6-getaddrinfo-amp-inet-ntop-td5891996.html 
+\*-------------------------------------------------------------------------*/
 
 #ifdef INET_PTON
-const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) 
 {
-        if (af == AF_INET)
-        {
-                struct sockaddr_in in;
-                memset(&in, 0, sizeof(in));
-                in.sin_family = AF_INET;
-                memcpy(&in.sin_addr, src, sizeof(struct in_addr));
-                getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
-                return dst;
-        }
-        else if (af == AF_INET6)
-        {
-                struct sockaddr_in6 in;
-                memset(&in, 0, sizeof(in));
-                in.sin6_family = AF_INET6;
-                memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
-                getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
-                return dst;
-        }
-        return NULL;
+    if (af == AF_INET) {
+        struct sockaddr_in in;
+        memset(&in, 0, sizeof(in));
+        in.sin_family = AF_INET;
+        memcpy(&in.sin_addr, src, sizeof(struct in_addr));
+        getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), 
+            dst, cnt, NULL, 0, NI_NUMERICHOST);
+        return dst;
+    } else if (af == AF_INET6) {
+        struct sockaddr_in6 in;
+        memset(&in, 0, sizeof(in));
+        in.sin6_family = AF_INET6;
+        memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
+        getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), 
+            dst, cnt, NULL, 0, NI_NUMERICHOST);
+        return dst;
+    }
+    return NULL;
 }
 
-int inet_pton(int af, const char *src, void *dst)
+int inet_pton(int af, const char *src, void *dst) 
 {
-        struct addrinfo hints, *res, *ressave;
-
-        memset(&hints, 0, sizeof(struct addrinfo));
-        hints.ai_family = af;
-
-        if (getaddrinfo(src, NULL, &hints, &res) != 0)
-        {
-                return -1;
-        }
-
-        ressave = res;
-
-        while (res)
-        {
-                memcpy(dst, res->ai_addr, res->ai_addrlen);
-                res = res->ai_next;
-        }
-
-        freeaddrinfo(ressave);
-        return 0;
+    struct addrinfo hints, *res, *ressave;
+    memset(&hints, 0, sizeof(struct addrinfo));
+    hints.ai_family = af;
+    if (getaddrinfo(src, NULL, &hints, &res) != 0) {
+        return -1;
+    }
+    ressave = res;
+    while (res) {
+        memcpy(dst, res->ai_addr, res->ai_addrlen);
+        res = res->ai_next;
+    }
+    freeaddrinfo(ressave); 
+    return 0;
 }
 
 #endif