goodfetccspi fix of scapy dissection to not feed it the length byte

[goodfet] / client / goodfet.ccspi

diff --git a/client/goodfet.ccspi b/client/goodfet.ccspi
index b9d269d..9d1cb87 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];
@@ -27,9 +19,11 @@ if(len(sys.argv)==1):
     print "%s test" % sys.argv[0];
     print "%s peek 0x$start [0x$stop]" % sys.argv[0];
     print "%s poke 0x$adr 0x$val" % sys.argv[0];
+    print "%s txtest" % sys.argv[0];
     
     print "\n%s rssi" % sys.argv[0];
     print "%s sniff" % sys.argv[0];
+    print "%s sniffdissect" % sys.argv[0];
     
     sys.exit();
 
@@ -43,6 +37,22 @@ client.setup();
 #Dummy read.
 #Might read as all ones if chip has a startup delay.
 
+if(sys.argv[1]=="carrier"):
+    if len(sys.argv)>2:
+        client.RF_setfreq(eval(sys.argv[2]));
+    while 1:    
+        client.RF_carrier();
+    while(1):
+        time.sleep(1);
+
+if(sys.argv[1]=="modulated_spectrum"):
+    if len(sys.argv)>2:
+        client.RF_setfreq(eval(sys.argv[2]));
+    while 1:
+        client.RF_modulated_spectrum();
+    while(1):
+        time.sleep(1);
+
 if(sys.argv[1]=="info"):
     print "Found   %s" % client.identstr();
     print "Freq:   %05f MHz" % (client.RF_getfreq()/(10**6));
@@ -74,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]=="sniffdissect"):
     #Promiscuous mode.
     client.RF_promiscuity(1);
     
@@ -88,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]=="sniffdissect":
+            client.printdissect(packet);
+        else:
+            client.printpacket(packet);
         sys.stdout.flush();
 if(sys.argv[1]=="txtest"):
     if len(sys.argv)>2:
@@ -102,11 +114,10 @@ if(sys.argv[1]=="txtest"):
             client.RF_setfreq(freq);
         else:
             print "Channels not yet supported."
-    print "Transmitting as %010x on %i MHz" % (
+    print "Transmitting DEADBEEF as %010x on %i MHz" % (
         client.RF_getsmac(),
         client.RF_getfreq()/10**6);
     
-    
     while 1:
         client.RF_txpacket([0x0f, 0x01, 0x08, 0x82,
                             0xff, 0xff, 0xff, 0xff,