Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 059cc345ef8f670bee72bbe650236672c7d3816c..83b582475da4bb2506b0e738580a9318f834d716 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -24,7 +24,7 @@
 #include "ui.h"
 #include "sleep.h"
 #include "cmdparser.h"
-#include "cmdmain.h"
+#include "cmdhw.h"
 
 // a global mutex to prevent interlaced printing from different threads
 pthread_mutex_t print_lock;
@@ -35,30 +35,31 @@ volatile static bool txcmd_pending = false;
 
 void SendCommand(UsbCommand *c) {
        #if 0
-               printf("Sending %d bytes\n", sizeof(UsbCommand));
+       printf("Sending %d bytes\n", sizeof(UsbCommand));
        #endif
 
        if (offline) {
-      PrintAndLog("Sending bytes to proxmark failed - offline");
-      return;
-    }
-  /**
+               PrintAndLog("Sending bytes to proxmark failed - offline");
+               return;
+       }
+       /**
        The while-loop below causes hangups at times, when the pm3 unit is unresponsive
        or disconnected. The main console thread is alive, but comm thread just spins here.
        Not good.../holiman
        **/
        while(txcmd_pending);
+
        txcmd = *c;
        txcmd_pending = true;
 }
 
 struct receiver_arg {
-       int run;
+  int run;
 };
 
 struct main_loop_arg {
-       int usb_present;
-       char *script_cmds_file;
+  int usb_present;
+  char *script_cmds_file;
 };
 
 byte_t rx[0x1000000];
@@ -70,22 +71,24 @@ static void *uart_receiver(void *targ) {
        size_t cmd_count;
 
        while (arg->run) {
+
                rxlen = sizeof(UsbCommand);
+
                if (uart_receive(sp, prx, &rxlen)) {
                        prx += rxlen;
-                       if (((prx-rx) % sizeof(UsbCommand)) != 0) {
+                       if (((prx-rx) % sizeof(UsbCommand)) != 0)
                                continue;
-                       }
+                       
                        cmd_count = (prx-rx) / sizeof(UsbCommand);
 
-                       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))) {
+               if (txcmd_pending) {
+                       if ( !uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand))) {
                                PrintAndLog("Sending bytes to proxmark failed");
                        }
                        txcmd_pending = false;
@@ -105,16 +108,18 @@ static void *main_loop(void *targ) {
        if (arg->usb_present == 1) {
                rarg.run = 1;
                pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
+               // cache Version information now:
+               CmdVersion(NULL);
        }
 
        FILE *script_file = NULL;
-       char script_cmd_buf[256];  // iceman, needs lua script the same file_path_buffer as the rest
+       char script_cmd_buf[256] = {0x00};  // iceman, needs lua script the same file_path_buffer as the rest
 
        if (arg->script_cmds_file) {
                script_file = fopen(arg->script_cmds_file, "r");
-               if (script_file) {
+               
+               if (script_file)
                        printf("using 'scripting' commands file %s\n", arg->script_cmds_file);
-               }
        }
 
        read_history(".history");
@@ -130,10 +135,13 @@ static void *main_loop(void *targ) {
                        } else {
                                char *nl;
                                nl = strrchr(script_cmd_buf, '\r');
-                               if (nl) *nl = '\0';
+                               if (nl)
+                                       *nl = '\0';
                                
                                nl = strrchr(script_cmd_buf, '\n');
-                               if (nl) *nl = '\0';
+                               
+                               if (nl)
+                                       *nl = '\0';
 
                                if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
                                        memset(cmd, 0, strlen(script_cmd_buf));
@@ -141,27 +149,22 @@ static void *main_loop(void *targ) {
                                        printf("%s\n", cmd);
                                }
                        }
-               }
-               
-               if (!script_file) {
-                       PrintAndLog("FOO!!");
+               } else {
                        cmd = readline(PROXPROMPT);
-                       PrintAndLog("BAR!!");
                }
                
-               PrintAndLog("SNAFU!!");
                if (cmd) {
 
                        while(cmd[strlen(cmd) - 1] == ' ')
                                cmd[strlen(cmd) - 1] = 0x00;
-                       
+
                        if (cmd[0] != 0x00) {
-                               if (strncmp(cmd, "quit", 4) == 0) {
-                                       exit(0);
-                                       break;
-                               }
-                               CommandReceived(cmd);
+                               int ret = CommandReceived(cmd);
                                add_history(cmd);
+                               
+                               // exit or quit
+                               if (ret == 99) 
+                                       break;
                        }
                        free(cmd);
                } else {
@@ -189,12 +192,12 @@ static void *main_loop(void *targ) {
 
 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);
+       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[]) {
@@ -224,7 +227,8 @@ int main(int argc, char* argv[]) {
                .usb_present = 0,
                .script_cmds_file = NULL
        };
-       pthread_t main_loop_t;
+       
+       pthread_t main_loop_threat;
 
   
        sp = uart_open(argv[1]);
@@ -252,25 +256,27 @@ int main(int argc, char* argv[]) {
                        printf("Output will be flushed after every print.\n");
                        flushAfterWrite = 1;
                }
-               else
-               marg.script_cmds_file = argv[2];
+               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_create(&main_loop_t, NULL, &main_loop, &marg);
+       pthread_create(&main_loop_threat, NULL, &main_loop, &marg);
        InitGraphics(argc, argv);
 
        MainGraphics();
 
-       pthread_join(main_loop_t, NULL);
+       pthread_join(main_loop_threat, NULL);
 
        // Clean up the port
-       uart_close(sp);
+       if (offline == 0)
+               uart_close(sp);
   
        // clean up mutex
        pthread_mutex_destroy(&print_lock);
   
-  return 0;
+       exit(0);
 }