X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/07976a256df582dbaf8b51a414e1a0c2188d06fb..c46b5bc438cde131ef9ceaca9874759171d35647:/client/proxmark3.c?ds=sidebyside diff --git a/client/proxmark3.c b/client/proxmark3.c index bf0f3817..641690a7 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,16 +34,11 @@ static UsbCommand txcmd; volatile static bool txcmd_pending = false; void SendCommand(UsbCommand *c) { -#if 0 + #if 0 printf("Sending %d bytes\n", sizeof(UsbCommand)); -#endif -/* - if (txcmd_pending) { - ERR("Sending command failed, previous command is still pending"); - } -*/ - if(offline) - { + #endif + + if (offline) { PrintAndLog("Sending bytes to proxmark failed - offline"); return; } @@ -66,21 +61,6 @@ 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; @@ -88,30 +68,30 @@ 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)) { + 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); + 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]; - - if (arg->script_cmds_file) - { + char script_cmd_buf[256]; // 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"); - while(1) - { + + while(1) { + // If there is a script file if (script_file) { - if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) - { + if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) { fclose(script_file); script_file = NULL; - } - else - { + } 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 ((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); @@ -168,23 +145,21 @@ static void *main_loop(void *targ) { } } - if (!script_file) - { + if (!script_file) { cmd = readline(PROXPROMPT); } if (cmd) { + while(cmd[strlen(cmd) - 1] == ' ') cmd[strlen(cmd) - 1] = 0x00; if (cmd[0] != 0x00) { - if (strncmp(cmd, "quit", 4) == 0) { - exit(0); + int ret = CommandReceived(cmd); + add_history(cmd); + if (ret == 99) { // exit or quit break; } - - CommandReceived(cmd); - add_history(cmd); } free(cmd); } else { @@ -199,26 +174,17 @@ static void *main_loop(void *targ) { rarg.run = 0; pthread_join(reader_thread, NULL); } - - if (script_file) - { + + 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"); -//} - static void dumpAllHelp(int markdown) { printf("\n%sProxmark3 command dump%s\n\n",markdown?"# ":"",markdown?"":"\n======================"); @@ -256,19 +222,8 @@ 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) { @@ -302,22 +257,20 @@ int main(int argc, char* argv[]) { // 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 + if (offline == 0) { uart_close(sp); + } // clean up mutex pthread_mutex_destroy(&print_lock); - return 0; + exit(0); }