FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifde...

[proxmark3-svn] / client / cmdlfhid.c

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 8ea01b6f976faa0bc7991bd68015a6e302b2dacf..93d06406851c581ed8e35e55786c76ee50b5157c 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -10,7 +10,6 @@
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

-//#include "proxusb.h"

 #include "proxmark3.h"
 #include "ui.h"
 #include "graph.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "graph.h"


@@ -40,63 +39,66 @@ int CmdHIDDemod(const char *Cmd)
 
 int CmdHIDDemodFSK(const char *Cmd)
 {
 
 int CmdHIDDemodFSK(const char *Cmd)
 {

-  UsbCommand c={CMD_HID_DEMOD_FSK};
+       int findone = 0;
+       if(Cmd[0]=='1') findone=1;
+       UsbCommand c = {CMD_HID_DEMOD_FSK};
+       c.arg[0]=findone;
+       SendCommand(&c);
+       return 0;
+}
+
+int CmdHIDSim(const char *Cmd)
+{
+  unsigned int hi = 0, lo = 0;
+  int n = 0, i = 0;
+
+  while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+    hi = (hi << 4) | (lo >> 28);
+    lo = (lo << 4) | (n & 0xf);
+  }
+
+  PrintAndLog("Emulating tag with ID %x%16x", hi, lo);
+  PrintAndLog("Press pm3-button to abort simulation");
+
+  UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};

   SendCommand(&c);
   return 0;
 }
 
   SendCommand(&c);
   return 0;
 }
 

-int CmdHIDSim(const char *Cmd)
+int CmdHIDClone(const char *Cmd)

 {
   unsigned int hi2 = 0, hi = 0, lo = 0;
   int n = 0, i = 0;
   UsbCommand c;
 
   if (strchr(Cmd,'l') != 0) {
 {
   unsigned int hi2 = 0, hi = 0, lo = 0;
   int n = 0, i = 0;
   UsbCommand c;
 
   if (strchr(Cmd,'l') != 0) {

-    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+       while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {

       hi2 = (hi2 << 4) | (hi >> 28);
       hi = (hi << 4) | (lo >> 28);
       lo = (lo << 4) | (n & 0xf);
     }
       hi2 = (hi2 << 4) | (hi >> 28);
       hi = (hi << 4) | (lo >> 28);
       lo = (lo << 4) | (n & 0xf);
     }

-    
+

     PrintAndLog("Cloning tag with long ID %x%08x%08x", hi2, hi, lo);
     PrintAndLog("Cloning tag with long ID %x%08x%08x", hi2, hi, lo);

-    
+

     c.d.asBytes[0] = 1;
     c.d.asBytes[0] = 1;

-       }
-       else {
-    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+  }
+  else {
+       while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {

       hi = (hi << 4) | (lo >> 28);
       lo = (lo << 4) | (n & 0xf);
     }
       hi = (hi << 4) | (lo >> 28);
       lo = (lo << 4) | (n & 0xf);
     }

-    
+

     PrintAndLog("Cloning tag with ID %x%08x", hi, lo);
     PrintAndLog("Cloning tag with ID %x%08x", hi, lo);

-    
+

     hi2 = 0;
     c.d.asBytes[0] = 0;
   }
     hi2 = 0;
     c.d.asBytes[0] = 0;
   }

-  
-  c.cmd = CMD_HID_CLONE_TAG;
-       c.arg[0] = hi2;
-       c.arg[1] = hi;
-       c.arg[2] = lo;
-  
-//  UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
-  SendCommand(&c);
-  return 0;
-}

 
 

-int CmdHIDClone(const char *Cmd)
-{
-  unsigned int hi = 0, lo = 0;
-  int n = 0, i = 0;
-
-  while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-    hi = (hi << 4) | (lo >> 28);
-    lo = (lo << 4) | (n & 0xf);
-  }
-
-  PrintAndLog("Cloning tag with ID %x%08x", hi, lo);
+  c.cmd = CMD_HID_CLONE_TAG;
+  c.arg[0] = hi2;
+  c.arg[1] = hi;
+  c.arg[2] = lo;

 
 

-  UsbCommand c = {CMD_HID_CLONE_TAG, {hi, lo}};

   SendCommand(&c);
   return 0;
 }
   SendCommand(&c);
   return 0;
 }


@@ -105,9 +107,9 @@ static command_t CommandTable[] =
 {
   {"help",      CmdHelp,        1, "This help"},
   {"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},
 {
   {"help",      CmdHelp,        1, "This help"},
   {"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},

-  {"fskdemod",  CmdHIDDemodFSK, 1, "Realtime HID FSK demodulator"},
-  {"sim",       CmdHIDSim,      1, "<ID> -- HID tag simulator"},
-  {"clone",     CmdHIDClone,    1, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},
+  {"fskdemod",  CmdHIDDemodFSK, 0, "['1'] Realtime HID FSK demodulator (option '1' for one tag only)"},
+  {"sim",       CmdHIDSim,      0, "<ID> -- HID tag simulator"},
+  {"clone",     CmdHIDClone,    0, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},

   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };