X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.ccspi;h=d5b869ce0ee1ff58dce3eb60c3a283e85dfd1ba1;hp=f780f209bf6bba3e36d448e7aff0ff7c5a34fc68;hb=fd9430b330def6518620ac0ec190405d186c7505;hpb=fc395768eb33962fe7f8e8e6d575117ddfb6265b

diff --git a/client/goodfet.ccspi b/client/goodfet.ccspi
index f780f20..d5b869c 100755
--- 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,12 @@ 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 sniff [chan]" % sys.argv[0];
+    print "%s bsniff [chan]" % sys.argv[0];
+    print "%s sniffdissect" % sys.argv[0];
     
     sys.exit();
 
@@ -74,7 +69,11 @@ if(sys.argv[1]=="test"):
     print "%02x %02x" % (ord(data[1]), ord(data[2]));
 if(sys.argv[1]=="rssi"):
     if len(sys.argv)>2:
-        client.RF_setfreq(eval(sys.argv[2]));
+        freq=eval(sys.argv[2]);
+        if freq>100:
+            client.RF_setfreq(freq);
+        else:
+            client.RF_setchan(freq);
     print "Listening on %f MHz." % (client.RF_getfreq()/10.0**6);
         
     client.strobe(0x02); #Calibrate
@@ -90,7 +89,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);
     
@@ -99,36 +98,92 @@ if(sys.argv[1]=="sniff"):
         if freq>100:
             client.RF_setfreq(freq);
         else:
-            print "Channels not yet supported."
+            client.RF_setchan(freq);
     client.CC_RFST_RX();
     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();
+        if sys.argv[1]=="sniffdissect":
+            client.printdissect(packet);
+        else:
+            client.printpacket(packet);
+        sys.stdout.flush();
+if(sys.argv[1]=="bsniff"):
+    #Just broadcast.
+    client.RF_promiscuity(0);
+    client.RF_setsmac(0xFFFFFFFF);
     
+    if len(sys.argv)>2:
+        freq=eval(sys.argv[2]);
+        if freq>100:
+            client.RF_setfreq(freq);
+        else:
+            client.RF_setchan(freq);
+    client.CC_RFST_RX();
+    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);
+        client.printpacket(packet);
         sys.stdout.flush();
+
 if(sys.argv[1]=="txtest"):
     if len(sys.argv)>2:
         freq=eval(sys.argv[2]);
         if freq>100:
             client.RF_setfreq(freq);
         else:
-            print "Channels not yet supported."
-    print "Transmitting as %010x on %i MHz" % (
+            client.RF_setchan(freq);
+    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,
                             0xde, 0xad, 0xbe, 0xef,
                             0xba, 0xbe, 0xc0]);
 
+if(sys.argv[1]=="txpiptest"):
+    if len(sys.argv)>2:
+        freq=eval(sys.argv[2]);
+        if freq>100:
+            client.RF_setfreq(freq);
+        else:
+            print "Channels not yet supported."
+    print "Transmitting on as %010x on %i MHz" % (
+        client.RF_getsmac(),
+        client.RF_getfreq()/10**6);
+    
+    while 1:
+        client.RF_txpacket([0x2f, 0x01, 0x08, 0x82,
+                            0xff, 0xff, 0xff, 0xff,
+                            0xde, 0xad, 0xbe, 0xef,
+                            0xba, 0xbe, 0xc0,
+                            
+                            0x00, 0x00, 0x00, 0x00,
+                            0x7a,
+                            0x0f, 0x01, 0x08, 0x82,
+                            0xff, 0xff, 0xff, 0xff,
+                            0xde, 0xad, 0xbe, 0xef,
+                            0xba, 0xbe, 0xc0,
+                            
+                            0xff, 0xff, 0xff, 0xff,
+                            0xff, 0xff, 0xff, 0xff,
+                            0xff, 0xff, 0xff, 0xff,
+                            0xff, 0xff, 0xff, 0xff,
+                            0xff, 0xff, 0xff, 0xff,
+                            0xff, 0xff, 0xff, 0xff,
+                            0xff, 0xff, 0xff, 0xff,
+                            ]);
+
 if(sys.argv[1]=="peek"):
     start=0x0000;
     if(len(sys.argv)>2):