X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.nrf;h=1e2a416cae1280d9430644f9638e37f4b4f1c704;hp=68d402d6f2491a6b8fb184b9100d23cec80adf65;hb=053fca013042a25eecdae93dc08955d6cc106468;hpb=c30a09c3d2be571f7ca2e915285be27781216af4

diff --git a/client/goodfet.nrf b/client/goodfet.nrf
index 68d402d..1e2a416 100755
--- a/client/goodfet.nrf
+++ b/client/goodfet.nrf
@@ -32,9 +32,10 @@ def printpacket(packet):
 
 
 mskbstring="";
+oldseq=-1;
 def printmspacket(packet,offset=1):
     """Decodes a Microsoft keyboard packet and maintains the typed strings."""
-    global mskbstring;
+    global mskbstring, oldseq;
     keyword=client.RF_getsmac();
     #print "keyword=%010x" % key;
     key=[];
@@ -55,10 +56,13 @@ def printmspacket(packet,offset=1):
             s="%s %02x" % (s,ord(foo));
         i=i+1;
     #Uncomment this to print the raw packet, kinda noisy.
-    #print "%s" % (s);
+    print "%s" % (s);
     
     letter=None;
-    if ct[0]==0x0a and ct[1]==0x78:
+    seq=ct[4];
+    if ct[0]==0x0a and ct[1]==0x78 and seq!=oldseq:
+        oldseq=seq;
+        #TODO replace this with a dictionary, and support modifiers.
         if ct[9]==0:
             #Key up event, not worth logging.
             pass;
@@ -79,11 +83,16 @@ def printmspacket(packet,offset=1):
             letter=ord('`');
         elif ct[9]==0x2C:
             letter=ord('_');
+        elif ct[9]==0x34:
+            letter=ord('\'');
+        elif ct[9]==0x36:
+            letter=ord(',');
         else:
             print "Unknown character 0x%02x." % ct[9];
+            letter=ord('?');
     if letter!=None:
         mskbstring="%s%c" % (mskbstring,letter);
-        print "# %s" % mskbstring
+    print "# %s" % mskbstring
 def printconfig():
     print "Encoding %s" % client.RF_getenc();
     print "Freq    %10i MHz" % (client.RF_getfreq()/10**6);
@@ -107,16 +116,12 @@ if(len(sys.argv)==1):
     print "%s sniffob\n\tSniffs OpenBeacon traffic." % sys.argv[0];
     print "%s snifftp\n\tSniffs Turning Point Clicker traffic." % sys.argv[0];
     print "%s sniffsf\n\tSniffs SparkFun Dongle traffic." % sys.argv[0];
+    print "%s sniffmskb\n\tSniffs Microsoft Keyboard traffic." % sys.argv[0];
     print "";
     print "%s sniffmacs \n\tSniffs for MAC addresses on the present channel." % sys.argv[0];
     print "%s sniffprom [0xaa|0x55]\n\tSniffs promiscuously for a preamble of 0xAA or 0x55" % sys.argv[0];
     print "%s autotune\n\tSearches for a valid destination address." % sys.argv[0];
     print "";
-    print "%s sniffskybrake\n\tSniffs skybrake. [broken?]" % sys.argv[0];
-    print "%s sniffmskb\n\tSniffs MS KB. [broken?]" % sys.argv[0];
-    
-    print "%s hosttp\n\tHosts Turning Point Clicker traffic." % sys.argv[0];
-
     print "%s carrier [freq]\n\tHolds a carrier on [freq] Hz." % sys.argv[0];
     sys.exit();
 
@@ -305,14 +310,18 @@ class AutoTuner():
     rate=False;
     chan=False;
     sync=False;
+    macreject=False;
+    printing=False;
     startch=0; #Useful for forcing an early match.
     def init(self,goodfet,
-             rate=True,chan=True,sync=True):
+             rate=True,chan=True,sync=True, macreject=True, printing=False):
         """Initializes a link to the GoodFET for autotuning."""
         self.client=goodfet;
         self.rate=rate;
         self.chan=chan;
         self.sync=sync;
+        self.macreject=macreject;
+        self.printing=printing;
         
         client.poke(0x00,0x00); #Stop nRF
         client.poke(0x01,0x00); #Disable Shockburst
@@ -349,17 +358,21 @@ class AutoTuner():
     def validmac(self,packet):
         sync=self.client.RF_getsmac()&0xFF;
         mac=self.packetaddr(packet,justmac=True);
-        if (ord(packet[0])&0x80)^(sync&0x80):
+        
+        #BT preamble is A or 5.
+        #Fix this to work on the smallest bit, not the highest.
+        if ((ord(packet[0])&0x80)^(sync&0x80)) and self.macreject:
             #print "%02x%02x invalid entry." % (sync,ord(packet[0]));
             #This is a special kind of failure.  Freq is probably right, but MAC is wrong.
             return False;
-        if mac=='5555555555' or mac=='aaaaaaaaaa' or mac=='0000000000':
+        if mac=='5555555555' or mac=='aaaaaaaaaa' or mac=='0000000000' or mac=='ffffffffff':
             return False;
         return True;
         
     def handle(self,packet):
         """Handles a packet."""
-        #printpacket(packet);
+        if self.printing:
+            printpacket(packet);
         
         if not self.validmac(packet):
             #print "Dropped packet from %s" % self.packetaddr(packet,justmac=True);
@@ -471,6 +484,34 @@ if(sys.argv[1]=="autotune"):
     guesser.selftune(threshold=2,
                      forever=True);
 
+if(sys.argv[1]=="autotunebt"):
+    #Reversal of transmitter code from nRF_CMD.c of OpenBeacon
+    #TODO remove all poke() calls.
+    guesser=AutoTuner();
+    guesser.init(client,rate=True,sync=False,chan=True,
+                 macreject=False, printing=True);
+    
+    
+    #client.RF_setfreq(2481 * 10**6);
+    client.poke(0x06,0x00); #1MBps
+    client.poke(0x07,0x78); #Reset status register
+    
+    #Bluetooth preamble is 0xA; BTLE is 0xAA.
+    client.RF_setsmac(0x000A);
+    
+    #Longest length.
+    client.RF_setpacketlen(32);
+    
+    #Power radio, prime for RX, no checksum
+    client.poke(0x00,0x70|0x03); #0x08 for checksum, 0x04 for two.
+    
+    print "Autotuning on %i MHz" % (
+        client.RF_getfreq()/10**6);
+    print "sync,mac,r5,r6";
+    #Now we're ready to get packets.
+    guesser.selftune(threshold=2,
+                     forever=True);
+
 if(sys.argv[1]=="sniffmacs"):
     #Reversal of transmitter code from nRF_CMD.c of OpenBeacon
     #TODO remove all poke() calls.
@@ -606,7 +647,8 @@ if(sys.argv[1]=="sniffant"):
 
 
 
-if(sys.argv[1]=="sniffskybrake"):
+
+if(sys.argv[1]=="sniffsf"):
     #Reversal of transmitter code from nRF_CMD.c of OpenBeacon
     #TODO remove all poke() calls.
     
@@ -614,28 +656,23 @@ if(sys.argv[1]=="sniffskybrake"):
     client.poke(0x01,0x00); #Disable Shockburst
     client.poke(0x02,0x01); #Set RX Pipe 0
     
-    client.RF_setfreq(2439 * 10**6);
-    client.poke(0x06,0x00); #1MBps
+    client.RF_setfreq(2402 * 10**6);
+    client.poke(0x06,0x07); #1Mbps
     client.poke(0x07,0x78); #Reset status register
     
     #OpenBeacon defines these in little endian as follows.
-    client.RF_setmaclen(2); # SETUP_AW for 3-byte addresses.
-    #0x01, 0x02, 0x03, 0x02, 0x01
-    
-    client.RF_setsmac(0x070700d2c4); #reversed
-    
-    #client.RF_setsmac(0xd2c4);
-    #client.RF_setsmac(0);
+    client.RF_setmaclen(5); # SETUP_AW for 5-byte addresses.
+    client.RF_setsmac(0xe7e7e7e7e7);
+    client.RF_settmac(0xe7e7e7e7e7);
     
-    #Mac packet length, illegally 0-length address field.
-    client.RF_setpacketlen(32);
+    #Set packet length of 16.
+    client.RF_setpacketlen(4);
     
     #Power radio, prime for RX, one-byte checksum.
-    client.poke(0x00,0x70|0x03); #0x08 for one byte, 0x04 for two.
+    client.poke(0x00,0x70|0x03|0x08); #0x08 for one byte, 0x04 for two.
     
     print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
                                            client.RF_getfreq()/10**6);
-    print "%i byte mac match." % client.RF_getmaclen();
     #Now we're ready to get packets.
     while 1:
         packet=None;
@@ -645,31 +682,31 @@ if(sys.argv[1]=="sniffskybrake"):
         printpacket(packet);
         sys.stdout.flush();
 
-if(sys.argv[1]=="sniffsf"):
-    #Reversal of transmitter code from nRF_CMD.c of OpenBeacon
+if(sys.argv[1]=="sniffnike"):
     #TODO remove all poke() calls.
     
     client.poke(0x00,0x00); #Stop nRF
     client.poke(0x01,0x00); #Disable Shockburst
     client.poke(0x02,0x01); #Set RX Pipe 0
     
-    client.RF_setfreq(2402 * 10**6);
-    client.poke(0x06,0x07); #1Mbps
+    client.RF_setfreq(2425 * 10**6);
+    client.poke(0x06,0x20|0x06); #250 kbps
     client.poke(0x07,0x78); #Reset status register
     
-    #OpenBeacon defines these in little endian as follows.
-    client.RF_setmaclen(5); # SETUP_AW for 5-byte addresses.
-    client.RF_setsmac(0xe7e7e7e7e7);
-    client.RF_settmac(0xe7e7e7e7e7);
+    #Nike Settings
+    client.RF_setmaclen(2); # Illegal by datasheet, but it works!
+    client.RF_setsmac(0xc2bd);
+    client.RF_settmac(0xc2bd); #Should we forge data?
     
-    #Set packet length of 16.
-    client.RF_setpacketlen(4);
+    client.RF_setpacketlen(32); #No idea what the length is.
     
-    #Power radio, prime for RX, one-byte checksum.
-    client.poke(0x00,0x70|0x03|0x08); #0x08 for one byte, 0x04 for two.
+    #Power radio, prime for RX, two-byte checksum.
+    client.poke(0x00,0x70|0x03); #0x08 for checksum, 0x04 for two bytes.
     
     print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
                                            client.RF_getfreq()/10**6);
+    print "Expect some false-positives.";
+    
     #Now we're ready to get packets.
     while 1:
         packet=None;
@@ -710,37 +747,6 @@ if(sys.argv[1]=="snifftp"):
         printpacket(packet);
         sys.stdout.flush();
 
-if(sys.argv[1]=="hosttp"):
-    client.poke(0x00,0x00); #Stop nRF
-    client.poke(0x01,0x00); #Disable Shockburst
-    client.poke(0x02,0x01); #Set RX Pipe 0
-    
-    chan=0x29;
-
-    client.RF_setfreq((2400+chan) * 10**6);
-    client.poke(0x06,0x00); #1Mbps
-    client.poke(0x07,0x78); #Reset status register
-    
-    client.RF_setmaclen(3); # SETUP_AW for 3-byte addresses.
-    client.RF_setsmac(0x123456);
-    client.RF_setpacketlen(4);
-    
-    #Power radio, prime for RX, two-byte checksum.
-    client.poke(0x00,0x70|0x03|0x04|0x08);
-    
-    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();
-        mac=((ord(packet[0])<<16)+
-             (ord(packet[1])<<8)+
-             ord(packet[2]));
-        key=packet[3];
-        print "%c from %06x" % (key,mac);
-        sys.stdout.flush();
 
 if(sys.argv[1]=="sniff"):
     if len(sys.argv)>2: