Add option -h to dump complete set of supported commands

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 5ac7cd0e2c137003a79ea25667f78b3a73be84dc..e40b4defe38d7dee1d3b4d48a4c1b3ae6360b615 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -21,12 +21,16 @@
 #include "proxgui.h"
 #include "cmdmain.h"
 #include "uart.h"
 #include "proxgui.h"
 #include "cmdmain.h"
 #include "uart.h"

-#include "messages.h"

 #include "ui.h"
 #include "ui.h"

+#include "sleep.h"
+
+// a global mutex to prevent interlaced printing from different threads
+pthread_mutex_t print_lock;

 
 static serial_port sp;
 static UsbCommand txcmd;
 
 static serial_port sp;
 static UsbCommand txcmd;

-static bool txcmd_pending = false;
+volatile static bool txcmd_pending = false;
+

 
 void SendCommand(UsbCommand *c) {
 #if 0
 
 void SendCommand(UsbCommand *c) {
 #if 0


@@ -37,6 +41,12 @@ void SendCommand(UsbCommand *c) {
     ERR("Sending command failed, previous command is still pending");
   }
 */
     ERR("Sending command failed, previous command is still pending");
   }
 */

+  if(offline)
+    {
+      PrintAndLog("Sending bytes to proxmark failed - offline");
+      return;
+    }
+

   while(txcmd_pending);
   txcmd = *c;
   txcmd_pending = true;
   while(txcmd_pending);
   txcmd = *c;
   txcmd_pending = true;


@@ -164,6 +174,7 @@ static void *main_loop(void *targ) {
                        
                        if (cmd[0] != 0x00) {
                                if (strncmp(cmd, "quit", 4) == 0) {
                        
                        if (cmd[0] != 0x00) {
                                if (strncmp(cmd, "quit", 4) == 0) {

+                                       exit(0);

                                        break;
                                }
                                
                                        break;
                                }
                                


@@ -195,20 +206,65 @@ static void *main_loop(void *targ) {
   return NULL;
 }
 
   return NULL;
 }
 

-int main(int argc, char* argv[]) {
-  srand(time(0));
+#define DUMPHELP(cmd) \
+  do { \
+    printf("%s\n", cmd); \
+    printf("---------------------------------------------\n"); \
+    CommandReceived(cmd); \
+    printf("\n"); \
+  } while (0)

 
 

-  if (argc < 2) {
-    printf("syntax: %s <port>\n\n",argv[0]);
-    return 1;
-  }
+static void dumphelp()
+{
+  offline=2;
+  printf("\n------------PROXMARK3 HELP DUMP--------------\n");
+  printf("Some commands are available only if a Proxmark is actually connected,\n");
+  printf("Those commands are flagged with \"@\" in front of their description.\n");
+  printf("\n");
+  DUMPHELP("help");
+  DUMPHELP("data help");
+  DUMPHELP("hf help");
+  DUMPHELP("hf 14a help");
+  DUMPHELP("hf 14b help");
+  DUMPHELP("hf 15 help");
+  DUMPHELP("hf epa help");
+  DUMPHELP("hf legic help");
+  DUMPHELP("hf iclass help");
+  DUMPHELP("hf mf help");
+  DUMPHELP("hw help");
+  DUMPHELP("lf help");
+  DUMPHELP("lf em4x help");
+  DUMPHELP("lf hid help");
+  DUMPHELP("lf ti help");
+  DUMPHELP("lf hitag help");
+  DUMPHELP("lf pcf7931 help");
+  DUMPHELP("lf t55xx help");
+}
+
+int main(int argc, char* argv[]) {
+       srand(time(0));
+  
+       if (argc < 2) {
+               printf("syntax: %s <port>\n\n",argv[0]);
+               printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
+               printf("help:   %s -h\n\n", argv[0]);
+               printf("\tDump all interactive help at once\n");
+               return 1;
+       }

   
   

-  // Make sure to initialize
-  struct main_loop_arg marg = {
-    .usb_present = 0,
-    .script_cmds_file = NULL
-  };
-  pthread_t main_loop_t;
+       if (strcmp(argv[1], "-h") == 0) {
+               printf("syntax: %s <port>\n\n",argv[0]);
+               printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
+               offline = 2;
+               dumphelp();
+               return 0;
+       }
+       // Make sure to initialize
+       struct main_loop_arg marg = {
+               .usb_present = 0,
+               .script_cmds_file = NULL
+       };
+       pthread_t main_loop_t;

 
 /*
   usb_init();
 
 /*
   usb_init();


@@ -221,34 +277,55 @@ int main(int argc, char* argv[]) {
     offline = 0;
   }
 */
     offline = 0;
   }
 */

-  sp = uart_open(argv[1]);
-  if (sp == INVALID_SERIAL_PORT) {
-    printf("ERROR: invalid serial port\n");
-    marg.usb_present = 0;
-    offline = 1;
-  } else {
-    marg.usb_present = 1;
-    offline = 0;
-  }
-
-  // If the user passed the filename of the 'script' to execute, get it
-  if (argc > 2 && argv[2]) {
-    marg.script_cmds_file = argv[2];
-  }

   
   

-  pthread_create(&main_loop_t, NULL, &main_loop, &marg);
-  InitGraphics(argc, argv);
+       sp = uart_open(argv[1]);
+       if (sp == INVALID_SERIAL_PORT) {
+               printf("ERROR: invalid serial port\n");
+               marg.usb_present = 0;
+               offline = 1;
+       } else if (sp == CLAIMED_SERIAL_PORT) {
+               printf("ERROR: serial port is claimed by another process\n");
+               marg.usb_present = 0;
+               offline = 1;
+       } else {
+               marg.usb_present = 1;
+               offline = 0;
+       }

 
 

-  MainGraphics();
+       // If the user passed the filename of the 'script' to execute, get it
+       if (argc > 2 && argv[2]) {
+               if (argv[2][0] == 'f' &&  //buzzy, if a word 'flush' passed, flush the output after every log entry.
+                       argv[2][1] == 'l' &&
+                       argv[2][2] == 'u' &&
+                       argv[2][3] == 's' &&
+                       argv[2][4] == 'h')
+               {
+                       printf("Output will be flushed after every print.\n");
+                       flushAfterWrite = 1;
+               }
+               else
+               marg.script_cmds_file = argv[2];
+       }
+
+       // create a mutex to avoid interlacing print commands from our different threads
+       pthread_mutex_init(&print_lock, NULL);

 
 

-  pthread_join(main_loop_t, NULL);
+       pthread_create(&main_loop_t, NULL, &main_loop, &marg);
+       InitGraphics(argc, argv);
+
+       MainGraphics();
+
+       pthread_join(main_loop_t, NULL);

 
 //  if (marg.usb_present == 1) {
 //    CloseProxmark();
 //  }
 
 
 //  if (marg.usb_present == 1) {
 //    CloseProxmark();
 //  }
 

-  // Clean up the port
-  uart_close(sp);
+       // Clean up the port
+       uart_close(sp);
+  
+       // clean up mutex
+       pthread_mutex_destroy(&print_lock);

   
   return 0;
 }
   
   return 0;
 }