X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cd00aa3043b507ed10bf79a37b83b88741d176d7..28afbd2bee49027d042030bfce07db2db8c7508b:/client/proxmark3.c diff --git a/client/proxmark3.c b/client/proxmark3.c index 3c3b7927..78bc1fe4 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -1,68 +1,172 @@ -#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 "translate.h" -#include "prox.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 { - int run; +static serial_port sp; +static UsbCommand txcmd; +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 { - 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; +//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; +//} - while(arg->run) { - if (ReceiveCommandP(&cmdbuf) > 0) { - int i; +byte_t rx[0x1000000]; +byte_t* prx = rx; - 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) { + 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); + } + } - rarg.run=1; - if (arg->usb_present == 1) { - pthread_create(&reader_thread, NULL, &usb_receiver, &rarg); + 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); } - cmd = readline(PROXPROMPT); - rarg.run=0; - if (arg->usb_present == 1) { - pthread_join(reader_thread, NULL); - } - + if (cmd) { + while(cmd[strlen(cmd) - 1] == ' ') + cmd[strlen(cmd) - 1] = 0x00; + if (cmd[0] != 0x00) { + if (strncmp(cmd, "quit", 4) == 0) { + break; + } + CommandReceived(cmd); add_history(cmd); } @@ -72,35 +176,84 @@ 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) -{ - struct main_loop_arg marg; - pthread_t main_loop_t; - usb_init(); - - if (!(devh = OpenProxmark(1))) { - fprintf(stderr,"PROXMARK3: NOT FOUND!\n"); - marg.usb_present = 0; - offline = 1; - } else { - marg.usb_present = 1; - offline = 0; - } +int main(int argc, char* argv[]) { + srand(time(0)); + + if (argc < 2) { + printf("syntax: %s \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; - pthread_create(&main_loop_t, NULL, &main_loop, &marg); - InitGraphics(argc, argv); +/* + 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 { + marg.usb_present = 1; + offline = 0; + } - MainGraphics(); + // If the user passed the filename of the 'script' to execute, get it + if (argc > 2 && argv[2]) { + marg.script_cmds_file = argv[2]; + } + + pthread_create(&main_loop_t, NULL, &main_loop, &marg); + InitGraphics(argc, argv); - pthread_join(main_loop_t, NULL); + MainGraphics(); - if (marg.usb_present == 1) { - CloseProxmark(); - } - return 0; + pthread_join(main_loop_t, NULL); + +// if (marg.usb_present == 1) { +// CloseProxmark(); +// } + + // Clean up the port + uart_close(sp); + + return 0; }