Update win_inet_pton 1.0.1 (934a852) → 1.1.0 (57e3558).

CHANGES.md

@@ -15,6 +15,7 @@
 * Update Six compatibility library 1.12.0 (d927b9e) to 1.12.0 (8da94b8)
 * Update Tornado Web Server 5.1.1 (cc2cf07) to 5.1.1 (a99f1471)
 * Update unidecode module 1.0.22 (578cdb9) to 1.0.22 (a5045ab)
+* Update win_inet_pton 1.0.1 (934a852) to 1.1.0 (57e3558)
 
 
 [develop changelog]

lib/win_inet_pton/win_inet_pton.py

@@ -4,81 +4,123 @@
 # commercial or non-commercial, and by any means.
 
 import socket
-import ctypes
 import os
+import sys
 
 
-class sockaddr(ctypes.Structure):
-    _fields_ = [("sa_family", ctypes.c_short),
-                ("__pad1", ctypes.c_ushort),
-                ("ipv4_addr", ctypes.c_byte * 4),
-                ("ipv6_addr", ctypes.c_byte * 16),
-                ("__pad2", ctypes.c_ulong)]
+def inject_into_socket():
+    import ctypes
 
-if hasattr(ctypes, 'windll'):
-    WSAStringToAddressA = ctypes.windll.ws2_32.WSAStringToAddressA
-    WSAAddressToStringA = ctypes.windll.ws2_32.WSAAddressToStringA
-else:
-    def not_windows():
-        raise SystemError(
-            "Invalid platform. ctypes.windll must be available."
-        )
-    WSAStringToAddressA = not_windows
-    WSAAddressToStringA = not_windows
+    class in_addr(ctypes.Structure):
+        _fields_ = [("S_addr", ctypes.c_ubyte * 4)]
 
+    class in6_addr(ctypes.Structure):
+        _fields_ = [("Byte", ctypes.c_ubyte * 16)]
 
-def inet_pton(address_family, ip_string):
-    addr = sockaddr()
-    addr.sa_family = address_family
-    addr_size = ctypes.c_int(ctypes.sizeof(addr))
+    if hasattr(ctypes, "windll"):
+        # InetNtopW(
+        #   INT         family,
+        #   const VOID  *pAddr,
+        #   PWSTR       pStringBuf,
+        #   size_t      StringBufSize
+        # ) -> PCWSTR
+        InetNtopW = ctypes.windll.ws2_32.InetNtopW
 
-    if WSAStringToAddressA(
-            ip_string,
-            address_family,
-            None,
-            ctypes.byref(addr),
-            ctypes.byref(addr_size)
-    ) != 0:
-        raise socket.error(ctypes.FormatError())
+        # InetPtonW(
+        #   INT         family,
+        #   PCWSTR      pszAddrString,
+        #   PVOID       pAddrBuf
+        # ) -> INT
+        InetPtonW = ctypes.windll.ws2_32.InetPtonW
 
-    if address_family == socket.AF_INET:
-        return ctypes.string_at(addr.ipv4_addr, 4)
-    if address_family == socket.AF_INET6:
-        return ctypes.string_at(addr.ipv6_addr, 16)
+        # WSAGetLastError() -> INT
+        WSAGetLastError = ctypes.windll.ws2_32.WSAGetLastError
+    else:
+
+        def not_windows():
+            raise SystemError("Invalid platform. ctypes.windll must be available.")
+
+        InetNtopW = not_windows
+        InetPtonW = not_windows
+        WSAGetLastError = not_windows
+
+    def inet_pton(address_family, ip_string):
+        if sys.version_info[0] > 2 and isinstance(ip_string, bytes):
+            raise TypeError("inet_pton() argument 2 must be str, not bytes")
 
-    raise socket.error('unknown address family')
+        if address_family == socket.AF_INET:
+            family = 2
+            addr = in_addr()
+        elif address_family == socket.AF_INET6:
+            family = 23
+            addr = in6_addr()
+        else:
+            raise OSError("unknown address family")
 
+        ip_string = ctypes.c_wchar_p(ip_string)
+        ret = InetPtonW(ctypes.c_int(family), ip_string, ctypes.byref(addr))
 
-def inet_ntop(address_family, packed_ip):
-    addr = sockaddr()
-    addr.sa_family = address_family
-    addr_size = ctypes.c_int(ctypes.sizeof(addr))
-    ip_string = ctypes.create_string_buffer(128)
-    ip_string_size = ctypes.c_int(ctypes.sizeof(ip_string))
+        if ret == 1:
+            if address_family == socket.AF_INET:
+                return ctypes.string_at(addr.S_addr, 4)
+            else:
+                return ctypes.string_at(addr.Byte, 16)
+        elif ret == 0:
+            raise socket.error("illegal IP address string passed to inet_pton")
+        else:
+            err = WSAGetLastError()
+            if err == 10047:
+                e = socket.error("unknown address family")
+            elif err == 10014:
+                e = OSError("bad address")
+            else:
+                e = OSError("unknown error from inet_ntop")
+            e.errno = err
+            raise e
 
+    def inet_ntop(address_family, packed_ip):
         if address_family == socket.AF_INET:
-        if len(packed_ip) != ctypes.sizeof(addr.ipv4_addr):
-            raise socket.error('packed IP wrong length for inet_ntoa')
-        ctypes.memmove(addr.ipv4_addr, packed_ip, 4)
+            addr = in_addr()
+            if len(packed_ip) != ctypes.sizeof(addr.S_addr):
+                raise ValueError("packed IP wrong length for inet_ntop")
+
+            ctypes.memmove(addr.S_addr, packed_ip, 4)
+            buffer_len = 16
+            family = 2
+
         elif address_family == socket.AF_INET6:
-        if len(packed_ip) != ctypes.sizeof(addr.ipv6_addr):
-            raise socket.error('packed IP wrong length for inet_ntoa')
-        ctypes.memmove(addr.ipv6_addr, packed_ip, 16)
+            addr = in6_addr()
+            if len(packed_ip) != ctypes.sizeof(addr.Byte):
+                raise ValueError("packed IP wrong length for inet_ntop")
+
+            ctypes.memmove(addr.Byte, packed_ip, 16)
+            buffer_len = 46
+            family = 23
         else:
-        raise socket.error('unknown address family')
+            raise ValueError("unknown address family")
+
+        buffer = ctypes.create_unicode_buffer(buffer_len)
 
-    if WSAAddressToStringA(
+        ret = InetNtopW(
+            ctypes.c_int(family),
             ctypes.byref(addr),
-            addr_size,
-            None,
-            ip_string,
-            ctypes.byref(ip_string_size)
-    ) != 0:
-        raise socket.error(ctypes.FormatError())
+            ctypes.byref(buffer),
+            ctypes.sizeof(buffer),
+        )
+        if ret is None:
+            err = WSAGetLastError()
+            if err == 10047:
+                e = ValueError("unknown address family")
+            else:
+                e = OSError("unknown error from inet_ntop")
+            e.errno = err
 
-    return ip_string[:ip_string_size.value - 1]
+        return ctypes.wstring_at(buffer, buffer_len).rstrip("\x00")
 
-# Adding our two functions to the socket library
-if os.name == 'nt':
+    # Adding our two functions to the socket library
     socket.inet_pton = inet_pton
     socket.inet_ntop = inet_ntop
+
+
+if os.name == "nt" and not hasattr(socket, "inet_pton"):
+    inject_into_socket()