X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f97d4e2378e04397b3c884d10acb79725dee4e06..4a843840e32dfa5c63c9e96fb858ecc156d04757:/client/proxmark3.c diff --git a/client/proxmark3.c b/client/proxmark3.c index bf0f3817..0fa55425 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -16,7 +16,7 @@ #include #include #include -//#include "proxusb.h" + #include "proxmark3.h" #include "proxgui.h" #include "cmdmain.h" @@ -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; @@ -34,27 +34,23 @@ 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"); - } -*/ - if(offline) - { - PrintAndLog("Sending bytes to proxmark failed - offline"); - return; - } - /** + #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; + while(txcmd_pending); + + txcmd = *c; + txcmd_pending = true; } struct receiver_arg { @@ -66,167 +62,149 @@ struct main_loop_arg { char *script_cmds_file; }; -//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) { - 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; irun) { + + 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; - 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]; + struct main_loop_arg *arg = (struct main_loop_arg*)targ; + struct receiver_arg rarg; + char *cmd = NULL; + pthread_t reader_thread; - if (arg->script_cmds_file) - { - script_file = fopen(arg->script_cmds_file, "r"); - if (script_file) - { - printf("using 'scripting' commands file %s\n", arg->script_cmds_file); - } - } + if (arg->usb_present == 1) { + rarg.run = 1; + pthread_create(&reader_thread, NULL, &uart_receiver, &rarg); + // cache Version information now: + CmdVersion(NULL); + } - 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) - { - memset(cmd, 0, strlen(script_cmd_buf)); - strcpy(cmd, script_cmd_buf); - printf("%s\n", cmd); - } - } - } + FILE *script_file = NULL; + 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) - { - cmd = readline(PROXPROMPT); + if (script_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'; + + int newlen = strlen(script_cmd_buf); + if ((cmd = (char*) malloc( newlen + 1)) != NULL) { + memset(cmd, 0x00, newlen); + strcpy(cmd, script_cmd_buf); + printf("%s\n", cmd); + } + } + } else { + cmd = readline(PROXPROMPT); } + // this one should pick up all non-null cmd... + // why is there a 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; - } - - CommandReceived(cmd); + int ret = CommandReceived(cmd); add_history(cmd); + + // exit or quit + if (ret == 99) + break; } free(cmd); + cmd = 0; } else { printf("\n"); break; } } - + + if (script_file) { + fclose(script_file); + script_file = NULL; + } + 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; -} -//static void dumpHelp(char *parent, ...) -//{ -// printf("## %s\n\n", parent); -// CommandReceived(parent); -// -// printf("\n"); -//} + free(cmd); + cmd = 0; + + if (arg->usb_present == 1) { + rarg.run = 0; + pthread_join(reader_thread, NULL); + } + + ExitGraphics(); + pthread_exit(NULL); + return NULL; +} 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[]) { @@ -256,19 +234,9 @@ int main(int argc, char* argv[]) { .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; - offline = 1; - } else { - marg.usb_present = 1; - offline = 0; - } -*/ + + pthread_t main_loop_threat; + sp = uart_open(argv[1]); if (sp == INVALID_SERIAL_PORT) { @@ -295,29 +263,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); - -// if (marg.usb_present == 1) { -// CloseProxmark(); -// } + 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); }