SUGGESTED FIX:

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 20ca057b3846629e62d75320b22da4881f040c87..637b2b0810d07477dd93e9bb7da2cac3b628954e 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -22,6 +22,7 @@
 #include "cmdhflegic.h"
 #include "cmdhficlass.h"
 #include "cmdhfmf.h"
+#include "cmdhfmfu.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -519,9 +520,9 @@ int CmdHFList(const char *Cmd)
        int tlen = param_getstr(Cmd,0,type);
        char param = param_getchar(Cmd, 1);
        bool errors = false;
-       uint8_t protocol = false;
+       uint8_t protocol = 0;
        //Validate params
-       if(tlen == 0 || (strcmp(type, "iclass") != 0 && strcmp(type,"14a") != 0))
+       if(tlen == 0)
        {
                errors = true;
        }
@@ -529,6 +530,25 @@ int CmdHFList(const char *Cmd)
        {
                errors = true;
        }
+       if(!errors)
+       {
+               if(strcmp(type, "iclass") == 0)
+               {
+                       protocol = ICLASS;
+               }else if(strcmp(type, "14a") == 0)
+               {
+                       protocol = ISO_14443A;
+               }
+               else if(strcmp(type, "14b") == 0)
+               {
+                       protocol = ISO_14443B;
+               }else if(strcmp(type,"raw")== 0)
+               {
+                       protocol = -1;//No crc, no annotations
+               }else{
+                       errors = true;
+               }
+       }
 
        if (errors) {
                PrintAndLog("List protocol data in trace buffer.");
@@ -543,20 +563,7 @@ int CmdHFList(const char *Cmd)
                PrintAndLog("example: hf list iclass");
                return 0;
        }
-       if(strcmp(type, "iclass") == 0)
-       {
-               protocol = ICLASS;
-       }else if(strcmp(type, "14a") == 0)
-       {
-               protocol = ISO_14443A;
-       }
-       else if(strcmp(type, "14b") == 0)
-       {
-               protocol = ISO_14443B;
-       }else if(strcmp(type,"raw")== 0)
-       {
-               protocol = -1;//No crc, no annotations
-       }
+
 
        if (param == 'f') {
                showWaitCycles = true;
@@ -595,6 +602,7 @@ static command_t CommandTable[] =
   {"legic",       CmdHFLegic,       0, "{ LEGIC RFIDs... }"},
   {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
   {"mf",               CmdHFMF,                1, "{ MIFARE RFIDs... }"},
+  {"mfu",                      CmdHFMFUltra,           1, "{ MIFARE Ultralight RFIDs... }"},
   {"tune",        CmdHFTune,        0, "Continuously measure HF antenna tuning"},
   {"list",       CmdHFList,         1, "List protocol data in trace buffer"},
        {NULL, NULL, 0, NULL}