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

[goodfet] / client / goodfet.cc

diff --git a/client/goodfet.cc b/client/goodfet.cc
index 3b3ade4..e58ec68 100755 (executable)
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -51,8 +51,12 @@ def handlesimplicitipacket(packet):
         counter=packet[11];
         button=packet[12];
         x=packet[13];
+        if x>=128: x=0-(x^0xFF)-1;
         y=packet[14];
+        if y>=128: y=0-(y^0xFF)-1;
         z=packet[15];
+        if z>=128: z=0-(z^0xFF)-1;
+        
         print "%09i %03i %4i %4i %4i" % (simplepacketcount,button,x,y,z);
         sys.stdout.flush();
     elif port==0x02:
@@ -68,9 +72,9 @@ def handlesimplicitipacket(packet):
                port, 0x21, seq,
                0x81, tid,         #reply, tid
                
-               0x20,0x00,0xad,0xde, #Join token
-               0x00];             #no security
-        printpacket(reply);
+               0x20,0x00,0xad,0xde, #link token
+               0x00];               #no security
+        #printpacket(reply);
         print "#FIXME FAST: repeatedly broadcasting ACK to catch LINK on the next attempt.";
         for foo in range(1,50):
             client.RF_txpacket(reply);
@@ -78,6 +82,7 @@ def handlesimplicitipacket(packet):
         pass;
     elif port==0x03:
         #print "Join request.";
+        #printpacket(packet);
         if packet[12]!=1:
             print "Not a join request.  WTF?";
             return;
@@ -90,11 +95,12 @@ def handlesimplicitipacket(packet):
                
                0xef,0xbe,0xad,0xde, #Join token
                0x00];             #no security
-        printpacket(reply);
+        #printpacket(reply);
         print "#FIXME FAST: repeatedly broadcasting ACK to catch JOIN on the next attempt.";
+        #printpacket(reply);
         for foo in range(1,50):
             client.RF_txpacket(reply);
-        #printpacket(reply);
+        
         
     elif port==0x04:
         print "Security request.";
@@ -112,6 +118,7 @@ if(len(sys.argv)==1):
     print "%s test" % sys.argv[0];
     print "%s term" % sys.argv[0];
     print "%s info" % sys.argv[0];
+    print "%s infotest" % sys.argv[0];
     print "%s halt"  % sys.argv[0];
     print "%s regs" % sys.argv[0];
     print "%s dumpcode $foo.hex [0x$start 0x$stop]" % sys.argv[0];
@@ -129,7 +136,10 @@ if(len(sys.argv)==1):
     print "%s reflex [freq]\n\tJams on [freq] Hz." % sys.argv[0];
     print "%s sniffsimpliciti [us|eu|lf]\n\tSniffs SimpliciTI packets." % sys.argv[0];
     print "%s sniffdash7 [lf]\n\tSniffs Dash7. (untested)" % sys.argv[0];
-    
+    print "%s snifficlicker [us]\n\tSniffs iClicker." % sys.argv[0];
+    print "\n";
+    print "%s simpliciti [us|eu|lf]\n\tSimpliciti access point for Chronos watch." % sys.argv[0];
+    print "%s iclicker [us|eu|lf]\n\tSniffs iClicker packets as ASCII." % sys.argv[0];
     
     sys.exit();
 
@@ -174,27 +184,7 @@ if(sys.argv[1]=="reflex"):
         #client.CCdebuginstr([0x02, 0xf0, 0x00]); #ljmp 0xF000
         client.resume();
     
-    RFST=0xDFE1
-    client.CC_RFST_CAL(); #SCAL
-    time.sleep(1);
-    
-    maxrssi=0;
-    while 1:
-        client.CC_RFST_RX(); #SRX
-        rssi=client.RF_getrssi();
-        client.CC_RFST_IDLE(); #idle
-        time.sleep(0.01);
-        string="";
-        for foo in range(0,rssi>>2):
-            string=("%s."%string);
-        print "%02x %04i %04i %s" % (rssi,rssi, maxrssi, string); 
-        if rssi>maxrssi:
-            maxrssi=(rssi);
-        if rssi>threshold:
-            #print "Triggered jamming for 1s.";
-            client.RF_carrier();
-            time.sleep(1);
-            print "JAMMING JAMMING JAMMING JAMMING";
+
 if(sys.argv[1]=="rssi"):
     client.CC1110_crystal();
     client.RF_idle();
@@ -220,6 +210,22 @@ if(sys.argv[1]=="rssi"):
             string=("%s."%string);
         print "%02x %04i %s" % (rssi,rssi, string); 
 
+if(sys.argv[1]=="sniff"):
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    #client.config_simpliciti(region);
+    
+    print "Listening as %x on %f MHz" % (client.RF_getsmac(),
+                                           client.RF_getfreq()/10.0**6);
+    #Now we're ready to get packets.
+    while 1:
+        packet=None;
+        while packet==None:
+            packet=client.RF_rxpacket();
+        printpacket(packet);
+        sys.stdout.flush();
+
 if(sys.argv[1]=="sniffsimpliciti"):
     region="us";
     if len(sys.argv)>2:
@@ -239,6 +245,24 @@ if(sys.argv[1]=="sniffsimpliciti"):
             packet=client.RF_rxpacket();
         printpacket(packet);
         sys.stdout.flush();
+if(sys.argv[1]=="sniffook"):
+    region="lf";
+    if len(sys.argv)>2:
+        region=sys.argv[2];
+    
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    client.config_ook(region);
+    
+    print "Listening for OOK on %f MHz" % (client.RF_getfreq()/10.0**6);
+    #Now we're ready to get packets.
+    while 1:
+        packet=None;
+        while packet==None:
+            packet=client.RF_rxpacket();
+        printpacket(packet);
+        sys.stdout.flush();
 if(sys.argv[1]=="sniffdash7"):
     region="lf";
     if len(sys.argv)>2:
@@ -258,6 +282,49 @@ if(sys.argv[1]=="sniffdash7"):
             packet=client.RF_rxpacket();
         printpacket(packet);
         sys.stdout.flush();
+if(sys.argv[1]=="snifficlicker"):
+    region="us";
+    if len(sys.argv)>2:
+        region=sys.argv[2];
+    
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    client.config_iclicker(region);
+    
+    print "Listening as %x on %f MHz" % (client.RF_getsmac(),
+                                           client.RF_getfreq()/10.0**6);
+    #Now we're ready to get packets.
+    while 1:
+        packet=None;
+        while packet==None:
+            packet=client.RF_rxpacket();
+        printpacket(packet);
+        sys.stdout.flush();
+if(sys.argv[1]=="iclicker"):
+    buttons=[0, 'A', 'j', 3, 4, 'B',
+             6, 7, 8, 9, 'E', 0xB, 0xC,
+             'C', 'D', 0xF];
+    region="us";
+    if len(sys.argv)>2:
+        region=sys.argv[2];
+    
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    client.config_iclicker(region);
+    
+    print "Listening as %x on %f MHz" % (client.RF_getsmac(),
+                                           client.RF_getfreq()/10.0**6);
+    #Now we're ready to get packets.
+    while 1:
+        packet=None;
+        while packet==None:
+            packet=client.RF_rxpacket();
+        printpacket(packet);
+        button=((packet[5]&1)<<3) | (packet[6]>>5);
+        print "Button %c" % buttons[button];
+        sys.stdout.flush();
 
 if(sys.argv[1]=="simpliciti"):
     region="us";
@@ -329,6 +396,11 @@ if(sys.argv[1]=="status"):
 if(sys.argv[1]=="halt"):
     print "Halting CPU."
     client.halt();
+
+if(sys.argv[1]=="infotest"):
+    while 1:
+        client.start();
+        print "Ident   %s" % client.CCidentstr();
 if(sys.argv[1]=="info"):
     print "Ident   %s" % client.CCidentstr();