From 0c56a7a23bde0d8e184534e5be6c4b248df3aac7 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Sun, 20 Jan 2019 03:21:07 +0100
Subject: [PATCH] Support ipv6 address packing/unpacking

---
 src/util/helper.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/util/helper.py b/src/util/helper.py
index 440400cb..3f67f141 100644
--- a/src/util/helper.py
+++ b/src/util/helper.py
@@ -9,6 +9,9 @@ import logging
 import base64
 import gevent
 
+if "inet_pton" not in dir(socket):
+    import win_inet_pton
+
 from Config import config
 
 
@@ -76,27 +79,31 @@ def shellquote(*args):
 
 
 def packPeers(peers):
-    packed_peers = {"ip4": [], "onion": []}
+    packed_peers = {"ipv4": [], "ipv6": [], "onion": []}
     for peer in peers:
         try:
-            if peer.ip.endswith(".onion"):
-                packed_peers["onion"].append(peer.packMyAddress())
-            else:
-                packed_peers["ip4"].append(peer.packMyAddress())
+            ip_type = getIpType(peer.ip)
+            packed_peers[ip_type].append(peer.packMyAddress())
         except Exception:
             logging.error("Error packing peer address: %s" % peer)
     return packed_peers
 
 
-# ip, port to packed 6byte format
+# ip, port to packed 6byte or 18byte format
 def packAddress(ip, port):
-    return socket.inet_aton(ip) + struct.pack("H", port)
+    if ":" in ip:
+        return socket.inet_pton(socket.AF_INET6, ip) + struct.pack("H", port)
+    else:
+        return socket.inet_aton(ip) + struct.pack("H", port)
 
 
-# From 6byte format to ip, port
+# From 6byte or 18byte format to ip, port
 def unpackAddress(packed):
-    assert len(packed) == 6, "Invalid length ip4 packed address: %s" % len(packed)
-    return socket.inet_ntoa(packed[0:4]), struct.unpack_from("H", packed, 4)[0]
+    if len(packed) == 18:
+        return socket.inet_ntop(socket.AF_INET6, packed[0:16]), struct.unpack_from("H", packed, 16)[0]
+    else:
+        assert len(packed) == 6, "Invalid length ip4 packed address: %s" % len(packed)
+        return socket.inet_ntoa(packed[0:4]), struct.unpack_from("H", packed, 4)[0]
 
 
 # onion, port to packed 12byte format
@@ -124,6 +131,7 @@ def getDirname(path):
 def getFilename(path):
     return path[path.rfind("/") + 1:]
 
+
 def getFilesize(path):
     try:
         s = os.stat(path)