X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ae7aa73dd529b84ad75c7a3c75461be1d7c18454..817d70961524a99d0d4acf9a7f49b422a1736678:/client/proxmark3.c diff --git a/client/proxmark3.c b/client/proxmark3.c index e40b4def..c100bbea 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -16,13 +16,15 @@ #include #include #include -//#include "proxusb.h" + #include "proxmark3.h" #include "proxgui.h" #include "cmdmain.h" #include "uart.h" #include "ui.h" #include "sleep.h" +#include "cmdparser.h" +#include "cmdmain.h" // a global mutex to prevent interlaced printing from different threads pthread_mutex_t print_lock; @@ -31,22 +33,20 @@ static serial_port sp; 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; } - + /** + 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; @@ -61,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; @@ -83,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); } - + 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); @@ -163,12 +143,12 @@ 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; @@ -177,7 +157,6 @@ static void *main_loop(void *targ) { exit(0); break; } - CommandReceived(cmd); add_history(cmd); } @@ -194,51 +173,25 @@ 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; } -#define DUMPHELP(cmd) \ - do { \ - printf("%s\n", cmd); \ - printf("---------------------------------------------\n"); \ - CommandReceived(cmd); \ - printf("\n"); \ - } while (0) - -static void dumphelp() +static void dumpAllHelp(int markdown) { - offline=2; - printf("\n------------PROXMARK3 HELP DUMP--------------\n"); - printf("Some commands are available only if a Proxmark is actually connected,\n"); - printf("Those commands are flagged with \"@\" in front of their description.\n"); + 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"); - DUMPHELP("help"); - DUMPHELP("data help"); - DUMPHELP("hf help"); - DUMPHELP("hf 14a help"); - DUMPHELP("hf 14b help"); - DUMPHELP("hf 15 help"); - DUMPHELP("hf epa help"); - DUMPHELP("hf legic help"); - DUMPHELP("hf iclass help"); - DUMPHELP("hf mf help"); - DUMPHELP("hw help"); - DUMPHELP("lf help"); - DUMPHELP("lf em4x help"); - DUMPHELP("lf hid help"); - DUMPHELP("lf ti help"); - DUMPHELP("lf hitag help"); - DUMPHELP("lf pcf7931 help"); - DUMPHELP("lf t55xx help"); + command_t *cmds = getTopLevelCommandTable(); + dumpCommandsRecursive(cmds, markdown); } int main(int argc, char* argv[]) { @@ -249,14 +202,18 @@ int main(int argc, char* argv[]) { 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"); return 1; } - if (strcmp(argv[1], "-h") == 0) { printf("syntax: %s \n\n",argv[0]); printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]); - offline = 2; - dumphelp(); + dumpAllHelp(0); + return 0; + } + if (strcmp(argv[1], "-m") == 0) { + dumpAllHelp(1); return 0; } // Make sure to initialize @@ -266,17 +223,6 @@ int main(int argc, char* argv[]) { }; 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; - } -*/ sp = uart_open(argv[1]); if (sp == INVALID_SERIAL_PORT) { @@ -317,10 +263,6 @@ int main(int argc, char* argv[]) { pthread_join(main_loop_t, NULL); -// if (marg.usb_present == 1) { -// CloseProxmark(); -// } - // Clean up the port uart_close(sp);