X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/022c8791c14841d9c32f19b8b06ef6651bdcbd15..6bfa18eab4750123d0e24090597b0d4c7bd58daf:/client/proxmark3.c?ds=inline diff --git a/client/proxmark3.c b/client/proxmark3.c index 05c2fe2d..bf0f3817 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -1,63 +1,188 @@ -#include +//----------------------------------------------------------------------------- +// Copyright (C) 2009 Michael Gernoth +// Copyright (C) 2010 iZsh +// +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. +//----------------------------------------------------------------------------- +// Main binary +//----------------------------------------------------------------------------- + #include -#include #include -#include #include -#include +#include +#include #include #include -#include - -#include "prox.h" +//#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; -struct usb_receiver_arg { - int run; +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"); + } +*/ + 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; + 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; - - while(arg->run) { - if (ReceiveCommandPoll(&cmdbuf)) { - int i; +//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; +//} - for (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); + // printf("received %d bytes, which represents %d commands\n",(prx-rx), cmd_count); + for (size_t i=0; iusb_present == 1) { - struct usb_receiver_arg rarg; - rarg.run=1; - pthread_create(&reader_thread, NULL, &usb_receiver, &rarg); - } - - while(1) { +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) + { + printf("using 'scripting' commands file %s\n", arg->script_cmds_file); + } + } - cmd = readline(PROXPROMPT); + 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); + } + } + } + + 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); + break; + } + CommandReceived(cmd); add_history(cmd); } @@ -67,19 +192,91 @@ static void *main_loop(void *targ) break; } } - - ExitGraphics(); - pthread_exit(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; } -int main(int argc, char **argv) +//static void dumpHelp(char *parent, ...) +//{ +// printf("## %s\n\n", parent); +// CommandReceived(parent); +// +// printf("\n"); +//} + +static void dumpAllHelp(int markdown) { - struct main_loop_arg marg; + 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[]) { + srand(time(0)); + + if (argc < 2) { + printf("syntax: %s \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"); + 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]); + dumpAllHelp(0); + return 0; + } + if (strcmp(argv[1], "-m") == 0) { + dumpAllHelp(1); + return 0; + } + // Make sure to initialize + struct main_loop_arg marg = { + .usb_present = 0, + .script_cmds_file = NULL + }; pthread_t main_loop_t; - usb_init(); - if (!(devh = OpenProxmark(1))) { - fprintf(stderr,"PROXMARK3: NOT FOUND!\n"); +/* + 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) { + 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 { @@ -87,6 +284,24 @@ int main(int argc, char **argv) offline = 0; } + // 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]; + } + + // 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); InitGraphics(argc, argv); @@ -94,8 +309,15 @@ int main(int argc, char **argv) pthread_join(main_loop_t, NULL); - if (marg.usb_present == 1) { - CloseProxmark(); - } - return 0; +// if (marg.usb_present == 1) { +// CloseProxmark(); +// } + + // Clean up the port + uart_close(sp); + + // clean up mutex + pthread_mutex_destroy(&print_lock); + + return 0; }