Python3 compat: Using bytearray

Author: AlexisTM

.gitignore

@@ -102,3 +102,4 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+.idea

rawsocketpy/__init__.py

@@ -1,4 +1,4 @@
 # Package init
 
-from get_hw import get_hw, u_to_str
-from main import RawPacket, RawSocket
+from .util import get_hw, u_to_str, protocol_to_ethertype, to_bytes
+from .main import RawPacket, RawSocket

rawsocketpy/main.py

@@ -1,5 +1,5 @@
 import socket, select, struct, time
-from .get_hw import get_hw, u_to_str
+from .util import get_hw, u_to_str, protocol_to_ethertype, to_bytes
 
 class RawPacket():
     def __init__(self, data):
@@ -27,7 +27,7 @@ def __init__(self, interface, protocol, sock=None, no_recv_protocol=False):
         if  not 0x0000 < protocol < 0xFFFF:
             raise ValueError("Protocol has to be in the range 0 to 65535")
         self.protocol = socket.htons(protocol)
-        self.ethertype = self.protocol_to_ethertype(protocol)
+        self.ethertype = protocol_to_ethertype(protocol)
         self.interface = interface
         self.mac = get_hw(self.interface)
         if no_recv_protocol:
@@ -42,14 +42,11 @@ def sock_create(interface, protocol, sock=None):
             sock.bind((interface, 0))
         return sock
 
-    @staticmethod
-    def protocol_to_ethertype(protocol):
-        return chr((protocol & 0xFF00) >> 8) + chr(protocol & 0x00FF)
-
     def send(self, msg, dest=None, ethertype=None):
         if ethertype is None: ethertype = self.ethertype
         if dest is None: dest = self.BROADCAST
-        self.sock.send(dest + self.mac + ethertype + msg)
+        payload = (to_bytes(dest) + self.mac + to_bytes(ethertype) +  to_bytes(msg))
+        self.sock.send(payload)
 
     def recv(self):
         data = self.sock.recv(1500)

rawsocketpy/get_hw.py renamed to rawsocketpy/util.py

@@ -11,20 +11,33 @@
     import binascii
     def get_hw(ifname):
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        info = fcntl.ioctl(s.fileno(), 0x8927,  struct.pack('256s',  bytes(ifname[:15], 'utf-8')))
+        info = fcntl.ioctl(s.fileno(), 0x8927,  struct.pack('256s',  bytearray(ifname[:15], 'utf-8')))
         return info[18:24]
 
-    def u_to_str(data, separator=":"):
-        return separator.join("{:02x}".format(ord(c)) for c in data).upper()
 else:
-
     def get_hw(ifname):
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         info = fcntl.ioctl(s.fileno(), 0x8927,  struct.pack('256s', ifname[:15]))
         return info[18:24]
 
-    def u_to_str(data, separator=":"):
-        return separator.join("{:02x}".format(ord(c)) for c in data).upper()
+def u_to_str(data, separator=":"):
+    return separator.join("{:02x}".format(ord(c)) for c in data).upper()
+
+def protocol_to_ethertype(protocol):
+    return chr((protocol & 0xFF00) >> 8) + chr(protocol & 0x00FF)
+
+def to_bytes(*data):
+    result = bytearray()
+    for d in data:
+        if type(d) in [tuple, list]:
+            baa = map(to_bytes, d)
+            for ba in baa:
+                result += ba
+        if type(d) is int:
+            result += bytearray([d])
+        if type(d) is str:
+            result += bytearray(map(ord, d))
+    return result
 
 def main():
     print(u_to_str(get_hw("wlp2s0")))