From a8df20775d1063df738dafa638a24a7ac0fd8779 Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Wed, 27 Sep 2017 23:47:26 +0200
Subject: [PATCH] Python 3: fix addresses
---
scapy/arch/linux.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scapy/arch/linux.py b/scapy/arch/linux.py
index b44b3f02..b106a841 100644
--- a/scapy/arch/linux.py
+++ b/scapy/arch/linux.py
@@ -294,7 +294,7 @@ def in6_getifaddr():
# addr, index, plen, scope, flags, ifname
tmp = i.split()
addr = struct.unpack('4s4s4s4s4s4s4s4s', tmp[0])
- addr = scapy.utils6.in6_ptop(b':'.join(addr))
+ addr = scapy.utils6.in6_ptop(b':'.join(addr).decode())
ret.append((addr, int(tmp[3], 16), tmp[5])) # (addr, scope, iface)
return ret
@@ -316,7 +316,7 @@ def read_routes6():
routes = []
def proc2r(p):
ret = struct.unpack('4s4s4s4s4s4s4s4s', raw(p))
- ret = b':'.join(ret)
+ ret = b':'.join(ret).decode()
return scapy.utils6.in6_ptop(ret)
lifaddr = in6_getifaddr()
--
GitLab