X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/806dc07542ab956f376811e59b4dca8f9c98af89..3b33bda694bcd22e2ceb8c9ff052f8fd4b81e3e8:/client/cmdmain.c?ds=sidebyside diff --git a/client/cmdmain.c b/client/cmdmain.c index 18515f65..9da1b308 100644 --- a/client/cmdmain.c +++ b/client/cmdmain.c @@ -27,13 +27,21 @@ #include "cmdscript.h" unsigned int current_command = CMD_UNKNOWN; -unsigned int received_command = CMD_UNKNOWN; -UsbCommand current_response; -UsbCommand current_response_user; +//unsigned int received_command = CMD_UNKNOWN; +//UsbCommand current_response; +//UsbCommand current_response_user; static int CmdHelp(const char *Cmd); static int CmdQuit(const char *Cmd); +//For storing command that are received from the device +#define CMD_BUFFER_SIZE 50 +static UsbCommand cmdBuffer[CMD_BUFFER_SIZE]; +//Points to the next empty position to write to +static int cmd_head;//Starts as 0 +//Points to the position of the last unread command +static int cmd_tail;//Starts as 0 + static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help. Use ' help' for details of the following commands:\n"}, @@ -58,30 +66,40 @@ int CmdQuit(const char *Cmd) exit(0); return 0; } - +/** + * Waits for a certain response type. This method waits for a maximum of + * ms_timeout milliseconds for a specified response command. + *@brief WaitForResponseTimeout + * @param cmd command to wait for + * @param response struct to copy received command into. + * @param ms_timeout + * @return true if command was returned, otherwise false + */ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) { - - // Wait until the command is received - for(size_t i=0; received_command != cmd && i < ms_timeout/10; i++) { - msleep(10); // XXX ugh - if (i == 200) { // Two seconds elapsed - PrintAndLog("Waiting for a response from the proxmark..."); - PrintAndLog("Don't forget to cancel its operation first by pressing on the button"); - } - } - - // Check if timeout occured - if(received_command != cmd) return false; - - // Copy the received response (if supplied) - if (response) { - memcpy(response, ¤t_response, sizeof(UsbCommand)); + + if (response == NULL) { + UsbCommand resp; + response = &resp; } - // Reset the received command - received_command = CMD_UNKNOWN; + // Wait until the command is received + for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) { + + while(getCommand(response)) + { + if(response->cmd == cmd){ + //We got what we expected + return true; + } - return true; + } + msleep(10); // XXX ugh + if (dm_seconds == 200) { // Two seconds elapsed + PrintAndLog("Waiting for a response from the proxmark..."); + PrintAndLog("Don't forget to cancel its operation first by pressing on the button"); + } + } + return false; } bool WaitForResponse(uint32_t cmd, UsbCommand* response) { @@ -168,6 +186,7 @@ void UsbCommandReceived(UsbCommand *UC) default: { // Maybe it's a response + /* switch(current_command) { case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: { if (UC->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) { @@ -179,43 +198,68 @@ void UsbCommandReceived(UsbCommand *UC) memcpy(sample_buf+UC->arg[0],UC->d.asBytes,48); sample_buf_len += 48; // for(i=0; i<48; i++) sample_buf[i] = UC->d.asBytes[i]; - received_command = UC->cmd; + //received_command = UC->cmd; } break; default: { } break; - } -// // Store the last received command -// memcpy(¤t_response, UC, sizeof(UsbCommand)); -// received_command = UC->cmd; - } break; - } - // Store the last received command - memcpy(¤t_response, UC, sizeof(UsbCommand)); - received_command = UC->cmd; -/* - // Maybe it's a response: - switch(current_command) { - case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: - if (UC->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) goto unexpected_response; - int i; - for(i=0; i<48; i++) sample_buf[i] = UC->d.asBytes[i]; - received_command = UC->cmd; - return; - case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: - case CMD_DOWNLOADED_SIM_SAMPLES_125K: - if (UC->cmd != CMD_ACK) goto unexpected_response; - // got ACK - received_command = UC->cmd; - return; - default: - unexpected_response: - - if(UC->cmd != CMD_ACK) - PrintAndLog("unrecognized command %08x \n", UC->cmd); - else - memcpy(¤t_response, UC, sizeof(UsbCommand)); - received_command = UC->cmd; + }*/ + } + break; } + + storeCommand(UC); + +} + +/** + * @brief This method should be called when sending a new command to the pm3. In case any old + * responses from previous commands are stored in the buffer, a call to this method should clear them. + * A better method could have been to have explicit command-ACKS, so we can know which ACK goes to which + * operation. Right now we'll just have to live with this. */ +void clearCommandBuffer() +{ + //This is a very simple operation + cmd_tail = cmd_head; +} + +/** + * @brief storeCommand stores a USB command in a circular buffer + * @param UC + */ +void storeCommand(UsbCommand *command) +{ + if( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail) + { + //If these two are equal, we're about to overwrite in the + // circular buffer. + PrintAndLog("WARNING: Command buffer about to overwrite command! This needs to be fixed!"); + } + //Store the command at the 'head' location + UsbCommand* destination = &cmdBuffer[cmd_head]; + memcpy(destination, command, sizeof(UsbCommand)); + + cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE; //increment head and wrap + +} +/** + * @brief getCommand gets a command from an internal circular buffer. + * @param response location to write command + * @return 1 if response was returned, 0 if nothing has been received + */ +int getCommand(UsbCommand* response) +{ + //If head == tail, there's nothing to read, or if we just got initialized + if(cmd_head == cmd_tail){ + return 0; + } + //Pick out the next unread command + UsbCommand* last_unread = &cmdBuffer[cmd_tail]; + memcpy(response, last_unread, sizeof(UsbCommand)); + //Increment tail - this is a circular buffer, so modulo buffer size + cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE; + + return 1; + }