remove ntop windows workaround

2 files changed, 5 insertions, 26 deletions

diff --git a/netlib/socks.py b/netlib/socks.py
index 01f54859..97df3478 100644
--- a/netlib/socks.py
+++ b/netlib/socks.py
@@ -96,10 +96,10 @@ class Message(object):
                              "Socks Request: Invalid reserved byte: %s" % rsv)
 
         if atyp == ATYP.IPV4_ADDRESS:
-            host = utils.inet_ntop(socket.AF_INET, f.read(4))  # We use tnoa here as ntop is not commonly available on Windows.
+            host = socket.inet_ntoa(f.read(4))  # We use tnoa here as ntop is not commonly available on Windows.
             use_ipv6 = False
         elif atyp == ATYP.IPV6_ADDRESS:
-            host = utils.inet_ntop(socket.AF_INET6, f.read(16))
+            host = socket.inet_ntop(socket.AF_INET6, f.read(16))
             use_ipv6 = True
         elif atyp == ATYP.DOMAINNAME:
             length, = struct.unpack("!B", f.read(1))
@@ -116,9 +116,9 @@ class Message(object):
     def to_file(self, f):
         f.write(struct.pack("!BBBB", self.ver, self.msg, 0x00, self.atyp))
         if self.atyp == ATYP.IPV4_ADDRESS:
-            f.write(utils.inet_pton(socket.AF_INET, self.addr.host))
+            f.write(socket.inet_aton(self.addr.host))
         elif self.atyp == ATYP.IPV6_ADDRESS:
-            f.write(utils.inet_pton(socket.AF_INET6, self.addr.host))
+            f.write(socket.inet_pton(socket.AF_INET6, self.addr.host))
         elif self.atyp == ATYP.DOMAINNAME:
             f.write(struct.pack("!B", len(self.addr.host)))
             f.write(self.addr.host)
diff --git a/netlib/utils.py b/netlib/utils.py
index 00e1cd12..69ba456a 100644
--- a/netlib/utils.py
+++ b/netlib/utils.py
@@ -43,25 +43,4 @@ def hexdump(s):
         parts.append(
             (o, x, cleanBin(part, True))
         )
-    return parts
-
-
-def inet_ntop(address_family, packed_ip):
-    if hasattr(socket, "inet_ntop"):
-        return socket.inet_ntop(address_family, packed_ip)
-    # Windows Fallbacks
-    if address_family == socket.AF_INET:
-        return socket.inet_ntoa(packed_ip)
-    if address_family == socket.AF_INET6:
-        ip = packed_ip.encode("hex")
-        return ":".join([ip[i:i + 4] for i in range(0, len(ip), 4)])
-
-
-def inet_pton(address_family, ip_string):
-    if hasattr(socket, "inet_pton"):
-        return socket.inet_pton(address_family, ip_string)
-    # Windows Fallbacks
-    if address_family == socket.AF_INET:
-        return socket.inet_aton(ip_string)
-    if address_family == socket.AF_INET6:
-        return ip_string.replace(":", "").decode("hex")
\ No newline at end of file
+    return parts
\ No newline at end of file