Merged with master

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index cff94903d1693e46e585f9d00fedc532fc9b67b5..528cae341c40e1fcd4023e8ead7c3d2d762511d8 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -21,18 +21,36 @@
 #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"
+#include "cmdparser.h"
+#include "cmdmain.h"
+
+// a global mutex to prevent interlaced printing from different threads
+pthread_mutex_t print_lock;

 
 static serial_port sp;
 
 static serial_port sp;

+static UsbCommand txcmd;
+volatile static bool txcmd_pending = false;

 
 void SendCommand(UsbCommand *c) {
 #if 0
   printf("Sending %d bytes\n", sizeof(UsbCommand));
 #endif
 
 void SendCommand(UsbCommand *c) {
 #if 0
   printf("Sending %d bytes\n", sizeof(UsbCommand));
 #endif

-  if (!uart_send(sp,(byte_t*)c,sizeof(UsbCommand))) {
-    ERR("Sending bytes to proxmark failed");
+/*
+  if (txcmd_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;

 }
 
 struct receiver_arg {
 }
 
 struct receiver_arg {


@@ -60,6 +78,7 @@ struct main_loop_arg {
 //}
 
 byte_t rx[0x1000000];
 //}
 
 byte_t rx[0x1000000];

+byte_t* prx = rx;

 
 static void *uart_receiver(void *targ) {
   struct receiver_arg *arg = (struct receiver_arg*)targ;
 
 static void *uart_receiver(void *targ) {
   struct receiver_arg *arg = (struct receiver_arg*)targ;


@@ -67,24 +86,32 @@ static void *uart_receiver(void *targ) {
   size_t cmd_count;
   
   while (arg->run) {
   size_t cmd_count;
   
   while (arg->run) {

-    if (uart_receive(sp,rx,&rxlen)) {
-      if ((rxlen % sizeof(UsbCommand)) != 0) {
-        PrintAndLog("ERROR: received %zd bytes, which does not seem to be one or more command(s)\n",rxlen);
+    rxlen = sizeof(UsbCommand);
+    if (uart_receive(sp,prx,&rxlen)) {
+      prx += rxlen;
+      if (((prx-rx) % sizeof(UsbCommand)) != 0) {

         continue;
       }
         continue;
       }

-      cmd_count = rxlen / sizeof(UsbCommand);
-//      printf("received %zd bytes, which represents %zd commands\n",rxlen, cmd_count);
+      cmd_count = (prx-rx) / sizeof(UsbCommand);
+      //      printf("received %d bytes, which represents %d commands\n",(prx-rx), cmd_count);

       for (size_t i=0; i<cmd_count; i++) {
         UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
       }
     }
       for (size_t i=0; i<cmd_count; i++) {
         UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
       }
     }

+    prx = rx;
+    
+    if(txcmd_pending) {
+      if (!uart_send(sp,(byte_t*)&txcmd,sizeof(UsbCommand))) {
+        PrintAndLog("Sending bytes to proxmark failed");
+      }
+      txcmd_pending = false;
+    }

   }
   
   pthread_exit(NULL);
   return NULL;
 }
 
   }
   
   pthread_exit(NULL);
   return NULL;
 }
 

-

 static void *main_loop(void *targ) {
   struct main_loop_arg *arg = (struct main_loop_arg*)targ;
   struct receiver_arg rarg;
 static void *main_loop(void *targ) {
   struct main_loop_arg *arg = (struct main_loop_arg*)targ;
   struct receiver_arg rarg;


@@ -128,7 +155,7 @@ static void *main_loop(void *targ) {
         nl = strrchr(script_cmd_buf, '\n');
         if (nl) *nl = '\0';
         
         nl = strrchr(script_cmd_buf, '\n');
         if (nl) *nl = '\0';
         

-        if ((cmd = (char*) malloc(strlen(script_cmd_buf))) != NULL)
+        if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL)

         {
           memset(cmd, 0, strlen(script_cmd_buf));
           strcpy(cmd, script_cmd_buf);
         {
           memset(cmd, 0, strlen(script_cmd_buf));
           strcpy(cmd, script_cmd_buf);


@@ -148,6 +175,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;
                                }
                                


@@ -179,19 +207,52 @@ static void *main_loop(void *targ) {
   return NULL;
 }
 
   return NULL;
 }
 

+//static void dumpHelp(char  *parent, ...)
+//{
+//  printf("## %s\n\n", parent);
+//  CommandReceived(parent);
+//  
+//  printf("\n");
+//}
+
+static void dumpAllHelp(int markdown)
+{
+  printf("\n%sProxmark3 command dump%s\n\n",markdown?"# ":"",markdown?"":"\n======================");
+  printf("Some commands are available only if a Proxmark is actually connected.%s\n",markdown?"  ":"");
+  printf("Check column \"offline\" for their availability.\n");
+  printf("\n");
+  command_t *cmds = getTopLevelCommandTable();
+  dumpCommandsRecursive(cmds, markdown);
+}
+

 int main(int argc, char* argv[]) {
 int main(int argc, char* argv[]) {

+       srand(time(0));

   
   

-  if (argc < 2) {
-    printf("syntax: %s <port>\n\n",argv[0]);
-    return 1;
-  }
-  
-  // Make sure to initialize
-  struct main_loop_arg marg = {
-    .usb_present = 0,
-    .script_cmds_file = NULL
-  };
-  pthread_t main_loop_t;
+       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");
+               printf("markdown:   %s -m\n\n", argv[0]);
+               printf("\tDump all interactive help at once in markdown syntax\n");
+               return 1;
+       }
+       if (strcmp(argv[1], "-h") == 0) {
+               printf("syntax: %s <port>\n\n",argv[0]);
+               printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
+               dumpAllHelp(0);
+               return 0;
+       }
+       if (strcmp(argv[1], "-m") == 0) {
+               dumpAllHelp(1);
+               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();


@@ -204,34 +265,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;
+       }
+
+       // 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);

 
 

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

 
 

-  pthread_join(main_loop_t, NULL);
+       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;
 }