Ignore precompiled python files and add ability to create lorawan pac…

…kets

.gitignore

@@ -0,0 +1 @@
+*.pyc

JoinAcceptPayload.py

@@ -49,15 +49,15 @@ def get_rxdelay(self):
     def get_cflist(self):
         return self.cflist
 
-    def compute_mic(self, key, mhdr):
+    def compute_mic(self, key, direction, mhdr):
         mic = []
         mic += self.to_clear_raw()
         mic += [mhdr]
 
         cmac = AES_CMAC()
         return cmac.encode(str(bytearray(key)), str(bytearray(mic)))[:4]
 
-    def decrypt_payload(self, key):
+    def decrypt_payload(self, key, direction):
         a = []
         a += self.encrypted_payload
         a += self.mic

JoinRequestPayload.py

@@ -29,9 +29,12 @@ def get_deveui(self):
     def get_devnonce(self):
         return self.devnonce
 
-    def compute_mic(self, key, mhdr):
+    def compute_mic(self, key, direction, mhdr):
         mic = [mhdr]
         mic += self.to_raw()
 
         cmac = AES_CMAC()
         return cmac.encode(str(bytearray(key)), str(bytearray(mic)))[:4]
+
+    def decrypt_payload(self, key, direction):
+        return self.to_raw()

MacPayload.py

@@ -31,9 +31,7 @@ def __init__(self, mtype, mac_payload):
             self.frm_payload = DataPayload(self, mac_payload[self.fhdr.length() + 1:])
 
     def length(self):
-        if self.frm_payload == None:
-            return self.fhdr.length()
-        return self.fhdr.length() + 1 + self.frm_payload.length()
+        return len(self.to_raw())
 
     def to_raw(self):
         mac_payload = []

PhyPayload.py

@@ -9,11 +9,22 @@
 
 class PhyPayload:
 
-    def __init__(self, packet):
+    def __init__(self):
+        self.direction = Direction(Direction.UP)
+
+    def length(self):
+        return len(self.to_raw())
+
+    def to_raw(self):
+        phy_payload = [self.mhdr]
+        phy_payload += self.mac_payload.to_raw()
+        phy_payload += self.mic
+        return phy_payload
+
+    def packet(self, packet):
         if len(packet) < 12:
             raise MalformedPacketException("Invalid lorawan packet");
 
-        self.direction = Direction(Direction.UP)
         self.mhdr = packet[0]
         self.mversion = MajorVersion(self.mhdr)
         self.mtype = MType(self.mhdr)
@@ -51,20 +62,8 @@ def get_mic(self):
     def set_mic(self, mic):
         self.mic = mic
 
-    def to_raw(self):
-        phy_payload = [self.mhdr]
-        phy_payload += self.mac_payload.to_raw()
-        phy_payload += self.mic
-        return phy_payload
-
     def compute_mic(self, key):
         return self.mac_payload.frm_payload.compute_mic(key, self.get_direction(), self.get_mhdr())
 
-    def decrypt_payload(self, key):
+    def get_payload(self, key):
         return self.mac_payload.frm_payload.decrypt_payload(key, self.get_direction())
-
-    def encrypt_payload(self, key, data):
-        return self.mac_payload.frm_payload.encrypt_payload(key, self.get_direction(), data)
-
-    def set_payload(self, key, data):
-        return self.mac_payload.frm_payload.set_payload(key, self.get_direction(), data)

__init__.py

@@ -1,4 +1,7 @@
 from PhyPayload import PhyPayload
 
-def new(packet):
-  return PhyPayload(packet)
+def new(packet = None):
+    phy_payload = PhyPayload()
+    if packet:
+        phy_payload.packet(packet)
+    return phy_payload