build: move inet_ntop(), inet_pton() emulation into compat

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

2 files changed, 0 insertions, 61 deletions

diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index e1526ff..608213b 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -3086,61 +3086,6 @@ link_socket_write_udp_posix_sendmsg (struct link_socket *sock,
 
 #ifdef WIN32
 
-/*
- * inet_ntop() and inet_pton() wrap-implementations using
- * WSAAddressToString() and WSAStringToAddress() functions
- *
- * this is needed as long as we support running OpenVPN on WinXP
- */
-
-const char *
-openvpn_inet_ntop(int af, const void *src, char *dst, socklen_t size)
-{
-  struct sockaddr_storage ss;
-  unsigned long s = size;
-
-  CLEAR(ss);
-  ss.ss_family = af;
-
-  switch(af) {
-    case AF_INET:
-      ((struct sockaddr_in *)&ss)->sin_addr = *(struct in_addr *)src;
-      break;
-    case AF_INET6:
-      ((struct sockaddr_in6 *)&ss)->sin6_addr = *(struct in6_addr *)src;
-      break;
-    default:
-      ASSERT (0);
-  }
-  /* cannot direclty use &size because of strict aliasing rules */
-  return (WSAAddressToString((struct sockaddr *)&ss, sizeof(ss), NULL, dst, &s) == 0)?
-          dst : NULL;
-}
-
-int
-openvpn_inet_pton(int af, const char *src, void *dst)
-{
-  struct sockaddr_storage ss;
-  int size = sizeof(ss);
-  char src_copy[INET6_ADDRSTRLEN+1];
-
-  CLEAR(ss);
-  /* stupid non-const API */
-  strncpynt(src_copy, src, INET6_ADDRSTRLEN+1);
-
-  if (WSAStringToAddress(src_copy, af, NULL, (struct sockaddr *)&ss, &size) == 0) {
-    switch(af) {
-      case AF_INET:
-	*(struct in_addr *)dst = ((struct sockaddr_in *)&ss)->sin_addr;
-	return 1;
-      case AF_INET6:
-	*(struct in6_addr *)dst = ((struct sockaddr_in6 *)&ss)->sin6_addr;
-	return 1;
-    }
-  }
-  return 0;
-}
-
 int
 socket_recv_queue (struct link_socket *sock, int maxsize)
 {
diff --git a/src/openvpn/win32.h b/src/openvpn/win32.h
index 09f897a..d87e987 100644
--- a/src/openvpn/win32.h
+++ b/src/openvpn/win32.h
@@ -266,12 +266,6 @@ char *get_win_sys_path (void);
 /* call self in a subprocess */
 void fork_to_self (const char *cmdline);
 
-const char *openvpn_inet_ntop(int af, const void *src,
-                              char *dst, socklen_t size);
-int openvpn_inet_pton(int af, const char *src, void *dst);
-#define inet_ntop(af,src,dst,size) openvpn_inet_ntop(af,src,dst,size)
-#define inet_pton(af,src,dst)      openvpn_inet_pton(af,src,dst)
-
 /* Find temporary directory */
 const char *win_get_tempdir();