From 66714e2c47bb0ff55e6f8360301af833f879b6ac Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 9 Nov 2020 11:46:01 +0100 Subject: wincompat: recent mingw has inet_ntop/inet_pton Signed-off-by: Jason A. Donenfeld --- src/wincompat/libc.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'src/wincompat/libc.c') diff --git a/src/wincompat/libc.c b/src/wincompat/libc.c index 870d913..3138370 100644 --- a/src/wincompat/libc.c +++ b/src/wincompat/libc.c @@ -6,8 +6,6 @@ #include #include #include -#include -#include #include char *strsep(char **str, const char *sep) @@ -69,37 +67,3 @@ ssize_t getline(char **buf, size_t *bufsiz, FILE *fp) { return getdelim(buf, bufsiz, '\n', fp); } - -int inet_pton(int af, const char *src, void *dst) -{ - struct sockaddr_storage ss = { 0 }; - int size = sizeof(ss); - char s[INET6_ADDRSTRLEN + 1]; - - strncpy(s, src, INET6_ADDRSTRLEN + 1); - s[INET6_ADDRSTRLEN] = '\0'; - - if (WSAStringToAddress(s, af, NULL, (struct sockaddr *)&ss, &size)) - return 0; - if (af == AF_INET) - *(struct in_addr *)dst = ((struct sockaddr_in *)&ss)->sin_addr; - else if (af == AF_INET6) - *(struct in6_addr *)dst = ((struct sockaddr_in6 *)&ss)->sin6_addr; - else - return 0; - return 1; -} - -const char *inet_ntop(int af, const void *src, char *dst, socklen_t size) -{ - struct sockaddr_storage ss = { .ss_family = af }; - unsigned long s = size; - - if (af == AF_INET) - ((struct sockaddr_in *)&ss)->sin_addr = *(struct in_addr *)src; - else if (af == AF_INET6) - ((struct sockaddr_in6 *)&ss)->sin6_addr = *(struct in6_addr *)src; - else - return NULL; - return WSAAddressToString((struct sockaddr *)&ss, sizeof(ss), NULL, dst, &s) ? NULL : dst; -} -- cgit v1.2.3-59-g8ed1b