X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1f947c4b09f79686adfce929d217a189286dd9b9..06b82e6a6d84d81ba84140dcd1417fcd27b71554:/client/proxmark3.c?ds=sidebyside diff --git a/client/proxmark3.c b/client/proxmark3.c index 4b898d54..102e03f7 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -16,101 +16,159 @@ #include #include #include -#include "proxusb.h" +//#include "proxusb.h" #include "proxmark3.h" #include "proxgui.h" #include "cmdmain.h" +#include "uart.h" +#include "ui.h" +#include "sleep.h" -struct usb_receiver_arg -{ +// 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 (txcmd_pending) { + ERR("Sending command failed, previous command is still pending"); + } +*/ + while(txcmd_pending); + txcmd = *c; + txcmd_pending = true; +} + +struct receiver_arg { int run; }; -struct main_loop_arg -{ +struct main_loop_arg { int usb_present; char *script_cmds_file; }; -static void *usb_receiver(void *targ) -{ - struct usb_receiver_arg *arg = (struct usb_receiver_arg*)targ; - UsbCommand cmdbuf; +//static void *usb_receiver(void *targ) { +// struct receiver_arg *arg = (struct receiver_arg*)targ; +// UsbCommand cmdbuf; +// +// while (arg->run) { +// if (ReceiveCommandPoll(&cmdbuf)) { +// UsbCommandReceived(&cmdbuf); +// fflush(NULL); +// } +// } +// +// pthread_exit(NULL); +// return NULL; +//} +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) { - if (ReceiveCommandPoll(&cmdbuf)) { - UsbCommandReceived(&cmdbuf); - fflush(NULL); + rxlen = sizeof(UsbCommand); + if (uart_receive(sp,prx,&rxlen)) { + prx += rxlen; + if (((prx-rx) % sizeof(UsbCommand)) != 0) { + continue; + } + cmd_count = (prx-rx) / sizeof(UsbCommand); + // printf("received %d bytes, which represents %d commands\n",(prx-rx), cmd_count); + for (size_t i=0; iusb_present == 1) { - rarg.run=1; - pthread_create(&reader_thread, NULL, &usb_receiver, &rarg); - } - - FILE *script_file = NULL; - char script_cmd_buf[256]; - - if (arg->script_cmds_file) +static void *main_loop(void *targ) { + struct main_loop_arg *arg = (struct main_loop_arg*)targ; + struct receiver_arg rarg; + char *cmd = NULL; + pthread_t reader_thread; + + if (arg->usb_present == 1) { + rarg.run=1; + // pthread_create(&reader_thread, NULL, &usb_receiver, &rarg); + pthread_create(&reader_thread, NULL, &uart_receiver, &rarg); + } + + FILE *script_file = NULL; + char script_cmd_buf[256]; + + if (arg->script_cmds_file) + { + script_file = fopen(arg->script_cmds_file, "r"); + if (script_file) { - script_file = fopen(arg->script_cmds_file, "r"); - if (script_file) - { - printf("using 'scripting' commands file %s\n", arg->script_cmds_file); - } + printf("using 'scripting' commands file %s\n", arg->script_cmds_file); } + } read_history(".history"); while(1) + { + // If there is a script file + if (script_file) + { + 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'; + + if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) { - // If there is a script file - if (script_file) - { - 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'; - - if ((cmd = (char*) malloc(strlen(script_cmd_buf))) != NULL) - { - memset(cmd, 0, strlen(script_cmd_buf)); - strcpy(cmd, script_cmd_buf); - printf("%s\n", cmd); - } - } - } + memset(cmd, 0, strlen(script_cmd_buf)); + strcpy(cmd, script_cmd_buf); + printf("%s\n", cmd); + } + } + } if (!script_file) { - cmd = readline(PROXPROMPT); + cmd = readline(PROXPROMPT); } if (cmd) { while(cmd[strlen(cmd) - 1] == ' ') - cmd[strlen(cmd) - 1] = 0x00; + cmd[strlen(cmd) - 1] = 0x00; if (cmd[0] != 0x00) { if (strncmp(cmd, "quit", 4) == 0) { + exit(0); break; } @@ -123,41 +181,43 @@ static void *main_loop(void *targ) break; } } - + write_history(".history"); - - if (arg->usb_present == 1) { - rarg.run = 0; - pthread_join(reader_thread, NULL); - } - - if (script_file) - { - fclose(script_file); - script_file = NULL; - } - - ExitGraphics(); - pthread_exit(NULL); - return NULL; -} - -int main(int argc, char **argv) -{ - // Make sure to initialize - struct main_loop_arg marg = { - .usb_present = 0, - .script_cmds_file = NULL - }; - pthread_t main_loop_t; - usb_init(); - - // If the user passed the filename of the 'script' to execute, get it - if (argc > 1 && argv[1]) + + if (arg->usb_present == 1) { + rarg.run = 0; + pthread_join(reader_thread, NULL); + } + + if (script_file) { - marg.script_cmds_file = argv[1]; + fclose(script_file); + script_file = NULL; } + + ExitGraphics(); + pthread_exit(NULL); + return NULL; +} +int main(int argc, char* argv[]) { + srand(time(0)); + + if (argc < 2) { + printf("syntax: %s \n\n",argv[0]); + printf("\tLinux example:'%s /dev/ttyACM0'\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; + +/* + usb_init(); if (!OpenProxmark(1)) { fprintf(stderr,"PROXMARK3: NOT FOUND!\n"); marg.usb_present = 0; @@ -166,16 +226,56 @@ int main(int argc, char **argv) marg.usb_present = 1; 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 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; + } - pthread_create(&main_loop_t, NULL, &main_loop, &marg); - InitGraphics(argc, argv); + // 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]; + } - MainGraphics(); + // 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); - if (marg.usb_present == 1) { - CloseProxmark(); - } + MainGraphics(); + + pthread_join(main_loop_t, NULL); + +// if (marg.usb_present == 1) { +// CloseProxmark(); +// } + + // Clean up the port + uart_close(sp); + + // clean up mutex + pthread_mutex_destroy(&print_lock); + return 0; }