Merge pull request #26 from openwsn-berkeley/develop_24

Develop 24

ArgusProbe_Beamlogic.py

@@ -47,9 +47,9 @@ class RxSnifferThread(threading.Thread):
     Thread which attaches to the sniffer and parses incoming frames.
     """
 
-    PCAP_GLOBALHEADER_LEN    = 24  # 4+2+2+4+4+4+4
-    PCAP_PACKETHEADER_LEN    = 16  # 4+4+4+4
-    BEAMLOGIC_HEADER_LEN     = 18  # 8+1+1+4+4
+    PCAP_GLOBALHEADER_LEN    = 24 # 4+2+2+4+4+4+4
+    PCAP_PACKETHEADER_LEN    = 16 # 4+4+4+4
+    BEAMLOGIC_HEADER_LEN     = 20 # 1+8+1+1+4+4+1
     PIPE_SNIFFER             = r'\\.\pipe\analyzer'
 
     def __init__(self, txMqttThread):
@@ -160,12 +160,12 @@ def _transformFrame(self, frame):
         Replace BeamLogic header by ZEP header.
         """
 
-        beamlogic  = self._parseBeamlogicHeader(frame[1:1+self.BEAMLOGIC_HEADER_LEN])
-        ieee154    = frame[self.BEAMLOGIC_HEADER_LEN+2:-1]
+        beamlogic  = self._parseBeamlogicHeader(frame[:self.BEAMLOGIC_HEADER_LEN])
+        ieee154    = frame[self.BEAMLOGIC_HEADER_LEN:beamlogic['Length']+self.BEAMLOGIC_HEADER_LEN]
         zep        = self._formatZep(
             channel         = beamlogic['Channel'],
             timestamp       = beamlogic['TimeStamp'],
-            length          = len(ieee154),
+            length          = beamlogic['Length'],
             rssi            = beamlogic['RSSI']
         )
 
@@ -186,12 +186,14 @@ def _parseBeamlogicHeader(self, header):
 
         returnVal = {}
         (
+            returnVal['Reserved'],
             returnVal['TimeStamp'],
             returnVal['Channel'],
             returnVal['RSSI'],
             returnVal['GpsLat'],
             returnVal['GpsLong'],
-        ) = struct.unpack('<QBBII', ''.join([chr(b) for b in header]))
+            returnVal['Length'],
+        ) = struct.unpack('<BQBBIIB', ''.join([chr(b) for b in header]))
 
         return returnVal