Add @Iceman1001 s cotag read

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index caae08e5dba137c1c96529e3a0fbd6e86fa60b19..e3671a4267fa1c7cb0a2710d48ddc960f7f0badf 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -669,14 +669,14 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
                return ans;
        }
                PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
                return ans;
        }

-       ans = HF14BInfo(false);
+       ans = HFiClassReader("", false, false);

        if (ans) {
        if (ans) {

-               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");

                return ans;
        }
                return ans;
        }

-       ans = HFiClassReader("", false, false);
+       ans = HF14BInfo(false);

        if (ans) {
        if (ans) {

-               PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");

                return ans;
        }
        ans = HF15Reader("", false);
                return ans;
        }
        ans = HF15Reader("", false);


@@ -688,6 +688,14 @@ int CmdHFSearch(const char *Cmd){
        return 0;
 }
 
        return 0;
 }
 

+int CmdHFSnoop(const char *Cmd)
+{
+       char * pEnd;
+       UsbCommand c = {CMD_HF_SNIFFER, {strtol(Cmd, &pEnd,0),strtol(pEnd, &pEnd,0),0}};
+       SendCommand(&c);
+       return 0;
+}
+

 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,                1, "This help"},
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,                1, "This help"},


@@ -703,6 +711,7 @@ static command_t CommandTable[] =
        {"tune",        CmdHFTune,              0, "Continuously measure HF antenna tuning"},
        {"list",        CmdHFList,              1, "List protocol data in trace buffer"},
        {"search",      CmdHFSearch,    1, "Search for known HF tags [preliminary]"},
        {"tune",        CmdHFTune,              0, "Continuously measure HF antenna tuning"},
        {"list",        CmdHFList,              1, "List protocol data in trace buffer"},
        {"search",      CmdHFSearch,    1, "Search for known HF tags [preliminary]"},

+       {"snoop",   CmdHFSnoop,     0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},

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