GoodFETCCSPI added sniffdisect verb that tries to load dot15d4 scapy library to use...

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@941 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/client/GoodFETCCSPI.py b/client/GoodFETCCSPI.py
index 5ffeb9d..fbf944f 100644 (file)
--- a/client/GoodFETCCSPI.py
+++ b/client/GoodFETCCSPI.py
@@ -266,3 +266,17 @@ class GoodFETCCSPI(GoodFET):
         choice=choices[len];
         self.poke(0x03,choice);
         self.maclen=len;
+    def printpacket(self,packet):
+        s="";
+        i=0;
+        for foo in packet:
+            s="%s %02x" % (s,ord(foo));
+        print "#%s" % s;
+    def printdisect(self,packet):
+        try:
+            from scapy.all import Dot15d4
+        except ImportError:
+            print "To use packet disection, Scapy must be installed and have the Dot15d4 extension present."
+        self.printpacket(packet)
+        scapyd = Dot15d4(packet)
+        print scapyd.show()

diff --git a/client/goodfet.ccspi b/client/goodfet.ccspi
index d0b4246..2c1590c 100755 (executable)
--- a/client/goodfet.ccspi
+++ b/client/goodfet.ccspi
@@ -12,14 +12,6 @@ import array, time;
 
 from GoodFETCCSPI import GoodFETCCSPI;
 
-def printpacket(packet):
-    s="";
-    i=0;
-    for foo in packet:
-        s="%s %02x" % (s,ord(foo));
-    print "#%s" % s;
-
-
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s info" % sys.argv[0];
@@ -31,6 +23,7 @@ if(len(sys.argv)==1):
     
     print "\n%s rssi" % sys.argv[0];
     print "%s sniff" % sys.argv[0];
+    print "%s sniffdisect" % sys.argv[0];
     
     sys.exit();
 
@@ -91,7 +84,7 @@ if(sys.argv[1]=="rssi"):
         for foo in range(0,rssi>>2):
             string=("%s."%string);
         print "%02x %04i %s" % (rssi,rssi, string); 
-if(sys.argv[1]=="sniff"):
+if(sys.argv[1]=="sniff" or sys.argv[1]=="sniffdisect"):
     #Promiscuous mode.
     client.RF_promiscuity(1);
     
@@ -105,12 +98,14 @@ if(sys.argv[1]=="sniff"):
     print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
                                             client.RF_getfreq()/10**6);
     #Now we're ready to get packets.
-    
     while 1:
         packet=None;
         while packet==None:
             packet=client.RF_rxpacket();
-        printpacket(packet);
+        if sys.argv[1]=="sniffdisect":
+            client.printdisect(packet);
+        else:
+            client.printpacket(packet);
         sys.stdout.flush();
 if(sys.argv[1]=="txtest"):
     if len(sys.argv)>2:
@@ -123,7 +118,6 @@ if(sys.argv[1]=="txtest"):
         client.RF_getsmac(),
         client.RF_getfreq()/10**6);
     
-    
     while 1:
         client.RF_txpacket([0x0f, 0x01, 0x08, 0x82,
                             0xff, 0xff, 0xff, 0xff,