mmmmmmmm

Author: SteveJM

zigdiggity/observers/stdout_observer.py

@@ -1,57 +1,37 @@
-import os
-import subprocess
-import hexdump
-
-from zigdiggity.misc.pcap_writer import PcapWriter
-from zigdiggity.observers.observer import Observer
-from zigdiggity.packets.dot154decode import *
-from scapy.layers.dot15d4 import *
-from scapy.layers.zigbee import *
-
-DLT_IEEE802_15_4 = 195
-
-stumbled = {}
-
-class StdoutObserver(Observer):
-    
-    def __init__(self):
-        pass
-
-    def notify(self, channel, packet):
-        if len(bytes(packet)) < 26:
-            return
-
-        d154 = Dot154PacketParser()
-        # Chop the packet up
-        pktdecode = d154.pktchop(bytes(packet))
-
-        # Byte-swap the frame control field
-        fcf = struct.unpack("<H", pktdecode[0])[0]
-        print("Type: %d" % (fcf & DOT154_FCF_TYPE_MASK))
-
-        # Check if this is a beacon frame
-        if (fcf & DOT154_FCF_TYPE_MASK) == DOT154_FCF_TYPE_BEACON:
-            # The 6th element offset in the Dot154PacketParser.pktchop() method
-            # contains the beacon data in its own list.  Extract the Ext PAN ID.
-            spanid = pktdecode[4]
-            source = pktdecode[5]
-            beacondata = pktdecode[6]
-            extpanid = beacondata[6][::-1]
-            stackprofilever = beacondata[4]
-            assocPermit = struct.unpack("<H", beacondata[0])[0] & 0x8000 == 0x8000
-            if assocPermit:
-                assoc = " ### Permitting New Associations ###"
-            else:
-                assoc = ""
-
-            key = spanid + source
-            value = [spanid, source, extpanid, stackprofilever, channel]
-            if not key in stumbled:
-                print("Beacon represents new network!" + assoc)
-                stumbled[key] = value
-            else:
-                if args.verbose:
-                    print("Received beacon response." + assoc)
-
-    def close(self):
-        pass
+import os
+import subprocess
+import hexdump
+
+from zigdiggity.observers.observer import Observer
+from scapy.layers.dot15d4 import *
+from scapy.layers.zigbee import *
+
+DOT154_FCF_TYPE_MASK            = 0x0007  #: Frame type mask
+
+PACKET_TYPES = {
+    "0": "Beacon",     #: Beacon frame
+    "1": "Data",       #: Data frame
+    "2": "Ack",        #: Acknowledgement frame
+    "3": "Mac Cmd"     #: MAC Command frame
+}
+
+class StdoutObserver(Observer):
+
+    def __init__(self):
+        pass
+
+    def notify(self, channel, packet):
+        if packet == None:
+            return
+
+        fcf = struct.unpack("<H",bytes(packet)[0:2])[0] & DOT154_FCF_TYPE_MASK
+        if (str(fcf) in PACKET_TYPES):
+            print("Type:", PACKET_TYPES[str(fcf)])
+        else:
+            print("Type: Unknown")
+
+        hexdump.hexdump(bytes(packet))
+        return
+
+    def close(self):
+        pass