HitagS Improvements (#721)

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 2ed127a4f934d2eb736c567af1de07d3d1e77af5..6fb066e8a5dbdaf5e4b7c8bbda22eafd6f6c27b5 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -9,6 +9,8 @@
 // Main binary
 //-----------------------------------------------------------------------------
 
 // Main binary
 //-----------------------------------------------------------------------------
 

+#include "proxmark3.h"
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -17,139 +19,97 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
 #include <readline/readline.h>
 #include <readline/history.h>
 

-#include "proxmark3.h"
+#include "util_posix.h"

 #include "proxgui.h"
 #include "cmdmain.h"
 #include "proxgui.h"
 #include "cmdmain.h"

-#include "uart.h"

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

+#include "util.h"

 #include "cmdparser.h"
 #include "cmdhw.h"
 #include "whereami.h"
 #include "cmdparser.h"
 #include "cmdhw.h"
 #include "whereami.h"

-
-
-// a global mutex to prevent interlaced printing from different threads
-pthread_mutex_t print_lock;
-
-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
-
-       if (offline) {
-      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;
-};
-
-struct main_loop_arg {
-       int usb_present;
-       char *script_cmds_file;
-};
-
-byte_t rx[0x1000000];
-byte_t* prx = rx;
-
-static void *uart_receiver(void *targ) {
-       struct receiver_arg *arg = (struct receiver_arg*)targ;
-       size_t rxlen;
-       size_t cmd_count;
-
-       while (arg->run) {
-               rxlen = sizeof(UsbCommand);
-               if (uart_receive(sp, prx, &rxlen)) {
-                       prx += rxlen;
-                       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))));
-                       }
-               }
-               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;
-}
-
-static void *main_loop(void *targ) {
-       struct main_loop_arg *arg = (struct main_loop_arg*)targ;
-       struct receiver_arg rarg;
+#include "comms.h"
+
+void
+#ifdef __has_attribute
+#if __has_attribute(force_align_arg_pointer)
+__attribute__((force_align_arg_pointer)) 
+#endif
+#endif
+main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {

        char *cmd = NULL;
        char *cmd = NULL;

-       pthread_t reader_thread;
-  
-       if (arg->usb_present == 1) {
-               rarg.run = 1;
-               pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
+       bool execCommand = (script_cmd != NULL);
+       bool stdinOnPipe = !isatty(STDIN_FILENO);
+
+       if (usb_present) {
+               SetOffline(false);

                // cache Version information now:
                CmdVersion(NULL);
                // cache Version information now:
                CmdVersion(NULL);

+       } else {
+               SetOffline(true);

        }
 
        }
 

+       // file with script

        FILE *script_file = 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] = {0};  // 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_cmds_file) {
+               script_file = fopen(script_cmds_file, "r");

                if (script_file) {
                if (script_file) {

-                       printf("using 'scripting' commands file %s\n", arg->script_cmds_file);
+                       printf("executing commands from file: %s\n", script_cmds_file);

                }
        }
 
        read_history(".history");
 
                }
        }
 
        read_history(".history");
 

-       while(1)  {
-
+       while (1) {

                // If there is a script file
                if (script_file)
                {
                // If there is a script file
                if (script_file)
                {

+                       memset(script_cmd_buf, 0, sizeof(script_cmd_buf));

                        if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {
                                fclose(script_file);
                                script_file = NULL;
                        } else {
                        if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {
                                fclose(script_file);
                                script_file = NULL;
                        } else {

-                               char *nl;
-                               nl = strrchr(script_cmd_buf, '\r');
-                               if (nl) *nl = '\0';
-                               
-                               nl = strrchr(script_cmd_buf, '\n');
-                               if (nl) *nl = '\0';
+                               strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));

 
 

-                               if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
-                                       memset(cmd, 0, strlen(script_cmd_buf));
-                                       strcpy(cmd, script_cmd_buf);
-                                       printf("%s\n", cmd);
+                               if ((cmd = strmcopy(script_cmd_buf)) != NULL) {
+                                       printf(PROXPROMPT"%s\n", cmd);
+                               }
+                       }
+               } else {
+                       // If there is a script command
+                       if (execCommand){
+                               if ((cmd = strmcopy(script_cmd)) != NULL) {
+                                       printf(PROXPROMPT"%s\n", cmd);
+                               }
+
+                               execCommand = false;
+                       } else {
+                               // exit after exec command
+                               if (script_cmd)
+                                       break;
+
+                               // if there is a pipe from stdin
+                               if (stdinOnPipe) {
+                                       memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
+                                       if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), stdin)) {
+                                               printf("\nStdin end. Exit...\n");
+                                               break;
+                                       }
+                                       strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
+
+                                       if ((cmd = strmcopy(script_cmd_buf)) != NULL) {
+                                               printf(PROXPROMPT"%s\n", cmd);
+                                       }
+                                       
+                               } else {                
+                                       // read command from command prompt
+                                       cmd = readline(PROXPROMPT);

                                }
                        }
                }
                
                                }
                        }
                }
                

-               if (!script_file) {
-                       cmd = readline(PROXPROMPT);
-               }
-               
+               // execute command

                if (cmd) {
 
                        while(cmd[strlen(cmd) - 1] == ' ')
                if (cmd) {
 
                        while(cmd[strlen(cmd) - 1] == ' ')


@@ -163,27 +123,19 @@ static void *main_loop(void *targ) {
                                }
                        }
                        free(cmd);
                                }
                        }
                        free(cmd);

+                       cmd = NULL;

                } else {
                        printf("\n");
                        break;
                }
        }
                } else {
                        printf("\n");
                        break;
                }
        }

-  
-       write_history(".history");
-  
-       if (arg->usb_present == 1) {
-               rarg.run = 0;
-               pthread_join(reader_thread, NULL);
-       }

 
 

+       write_history(".history");
+       

        if (script_file) {
                fclose(script_file);
                script_file = NULL;
        }
        if (script_file) {
                fclose(script_file);
                script_file = NULL;
        }

-
-       ExitGraphics();
-       pthread_exit(NULL);
-       return NULL;

 }
 
 static void dumpAllHelp(int markdown)
 }
 
 static void dumpAllHelp(int markdown)


@@ -199,12 +151,12 @@ static void dumpAllHelp(int markdown)
 static char *my_executable_path = NULL;
 static char *my_executable_directory = NULL;
 
 static char *my_executable_path = NULL;
 static char *my_executable_directory = NULL;
 

-const char const *get_my_executable_path(void)
+const char *get_my_executable_path(void)

 {
        return my_executable_path;
 }
 
 {
        return my_executable_path;
 }
 

-const char const *get_my_executable_directory(void)
+const char *get_my_executable_directory(void)

 {
        return my_executable_directory;
 }
 {
        return my_executable_directory;
 }


@@ -219,89 +171,146 @@ static void set_my_executable_path(void)
                        my_executable_path[path_length] = '\0';
                        my_executable_directory = (char *)malloc(dirname_length + 2);
                        strncpy(my_executable_directory, my_executable_path, dirname_length+1);
                        my_executable_path[path_length] = '\0';
                        my_executable_directory = (char *)malloc(dirname_length + 2);
                        strncpy(my_executable_directory, my_executable_path, dirname_length+1);

+                       my_executable_directory[dirname_length+1] = '\0';

                }
        }
 }
 
                }
        }
 }
 

+static void show_help(bool showFullHelp, char *command_line){
+       printf("syntax: %s <port> [-h|-help|-m|-f|-flush|-w|-wait|-c|-command|-l|-lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
+       printf("\texample: %s "SERIAL_PORT_H"\n\n", command_line);
+
+       if (showFullHelp){
+               printf("help: <-h|-help> Dump all interactive command's help at once.\n");
+               printf("\t%s  -h\n\n", command_line);
+               printf("markdown: <-m> Dump all interactive help at once in markdown syntax\n");
+               printf("\t%s -m\n\n", command_line);
+               printf("flush: <-f|-flush> Output will be flushed after every print.\n");
+               printf("\t%s -f\n\n", command_line);
+               printf("wait: <-w|-wait> 20sec waiting the serial port to appear in the OS\n");
+               printf("\t%s "SERIAL_PORT_H" -w\n\n", command_line);
+               printf("script: A script file with one proxmark3 command per line.\n\n");
+               printf("command: <-c|-command> Execute one proxmark3 command.\n");
+               printf("\t%s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"\n", command_line);
+               printf("\t%s "SERIAL_PORT_H" -command \"hf mf nested 1 *\"\n\n", command_line);
+               printf("lua: <-l|-lua> Execute lua script.\n");
+               printf("\t%s "SERIAL_PORT_H" -l hf_read\n\n", command_line);
+       }
+}
+

 int main(int argc, char* argv[]) {
        srand(time(0));
   
 int main(int argc, char* argv[]) {
        srand(time(0));
   

+       bool usb_present = false;
+       bool waitCOMPort = false;
+       bool executeCommand = false;
+       bool addLuaExec = false;
+       char *script_cmds_file = NULL;
+       char *script_cmd = NULL;
+

        if (argc < 2) {
        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");
+               show_help(true, argv[0]);

                return 1;
        }
                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;
-       }

 
 

-       set_my_executable_path();
-       
-       // Make sure to initialize
-       struct main_loop_arg marg = {
-               .usb_present = 0,
-               .script_cmds_file = NULL
-       };
-       pthread_t main_loop_threat;
+       for (int i = 1; i < argc; i++) {
+               if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i],"-help") == 0) {
+                       show_help(false, argv[0]);
+                       dumpAllHelp(0);
+                       return 0;
+               }
+               
+               if (strcmp(argv[i], "-m") == 0) {
+                       dumpAllHelp(1);
+                       return 0;
+               }
+               
+               if(strcmp(argv[i],"-f") == 0 || strcmp(argv[i],"-flush") == 0){
+                       printf("Output will be flushed after every print.\n");
+                       SetFlushAfterWrite(true);
+               }
+               
+               if(strcmp(argv[i],"-w") == 0 || strcmp(argv[i],"-wait") == 0){
+                       waitCOMPort = true;
+               }

 
 

-  
-       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(strcmp(argv[i],"-c") == 0 || strcmp(argv[i],"-command") == 0){
+                       executeCommand = true;
+               }
+
+               if(strcmp(argv[i],"-l") == 0 || strcmp(argv[i],"-lua") == 0){
+                       executeCommand = true;
+                       addLuaExec = true;
+               }

        }
 
        }
 

-       // 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;
+       // If the user passed the filename of the 'script' to execute, get it from last parameter
+       if (argc > 2 && argv[argc - 1] && argv[argc - 1][0] != '-') {
+               if (executeCommand){
+                       script_cmd = argv[argc - 1];
+                       
+                       while(script_cmd[strlen(script_cmd) - 1] == ' ')
+                               script_cmd[strlen(script_cmd) - 1] = 0x00;
+                       
+                       if (strlen(script_cmd) == 0) {
+                               script_cmd = NULL;
+                       } else {
+                               if (addLuaExec){
+                                       // add "script run " to command
+                                       char *ctmp = NULL;
+                                       int len = strlen(script_cmd) + 11 + 1;
+                                       if ((ctmp = (char*) malloc(len)) != NULL) {
+                                               memset(ctmp, 0, len);
+                                               strcpy(ctmp, "script run ");
+                                               strcpy(&ctmp[11], script_cmd);
+                                               script_cmd = ctmp;
+                                       }
+                               }
+                               
+                               printf("Execute command from commandline: %s\n", script_cmd);
+                       }
+               } else {
+                       script_cmds_file = argv[argc - 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);
+       // check command
+       if (executeCommand && (!script_cmd || strlen(script_cmd) == 0)){
+               printf("ERROR: execute command: command not found.\n");
+               return 2;
+       }
+       
+       // set global variables
+       set_my_executable_path();

 
 

-       pthread_create(&main_loop_threat, NULL, &main_loop, &marg);
-       InitGraphics(argc, argv);
+       // try to open USB connection to Proxmark
+       usb_present = OpenProxmark(argv[1], waitCOMPort, 20, false);

 
 

+#ifdef HAVE_GUI
+#ifdef _WIN32
+       InitGraphics(argc, argv, script_cmds_file, script_cmd, usb_present);

        MainGraphics();
        MainGraphics();

+#else
+       char* display = getenv("DISPLAY");

 
 

-       pthread_join(main_loop_threat, NULL);
+       if (display && strlen(display) > 1)
+       {
+               InitGraphics(argc, argv, script_cmds_file, script_cmd, usb_present);
+               MainGraphics();
+       }
+       else
+       {
+               main_loop(script_cmds_file, script_cmd, usb_present);
+       }
+#endif
+#else
+       main_loop(script_cmds_file, script_cmd, usb_present);
+#endif 

 
        // Clean up the port
 
        // Clean up the port

-       if (offline == 0) {
-               uart_close(sp);
+       if (usb_present) {
+               CloseProxmark();

        }
 
        }
 

-       // clean up mutex
-       pthread_mutex_destroy(&print_lock);
-

        exit(0);
 }
        exit(0);
 }