From: travisutk Date: Wed, 19 Jan 2011 23:03:15 +0000 (+0000) Subject: Nordic MACs of all zeroes are now ignored in autotune. X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=55b903088b974a6507728959985500b8d0b85fa8 Nordic MACs of all zeroes are now ignored in autotune. Sniff verb takes an address. git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@847 12e2690d-a6be-4b82-a7b7-67c4a43b65c8 --- diff --git a/client/goodfet.nrf b/client/goodfet.nrf index 57766c4..1eca80c 100755 --- a/client/goodfet.nrf +++ b/client/goodfet.nrf @@ -316,7 +316,7 @@ class AutoTuner(): #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': + if mac=='5555555555' or mac=='aaaaaaaaaa' or mac=='0000000000': return False; return True; @@ -474,7 +474,7 @@ if(sys.argv[1]=="sniffmskb"): client.poke(0x00,0x00); #Stop nRF client.poke(0x01,0x00); #Disable Shockburst client.poke(0x02,0x01); #Set RX Pipe 0 - #client.RF_setmaclen(3); + client.RF_setmaclen(5); #Finally, dynamic payload lengths need to be enabled. #client.poke(0x01,0x01); @@ -629,6 +629,9 @@ if(sys.argv[1]=="hosttp"): sys.stdout.flush(); if(sys.argv[1]=="sniff"): + if len(sys.argv)>2: + client.tune(sys.argv[2]); + #client.poke(0x00,0x00); #Stop nRF client.poke(0x07,0x78); #Reset status register