Fixed so storeCommand/getCommand are multithread-safe (at least dual-thread). Hopeful...

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 8f4618c9674d8cfda47299bdc08039a9a4368a94..972558c340d56685000279ed7db3ef5f31476665 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -14,6 +14,7 @@
 #include <string.h>
 #include "sleep.h"
 #include "cmdparser.h"
 #include <string.h>
 #include "sleep.h"
 #include "cmdparser.h"

+#include "proxmark3.h"

 #include "data.h"
 #include "usb_cmd.h"
 #include "ui.h"
 #include "data.h"
 #include "usb_cmd.h"
 #include "ui.h"


@@ -22,15 +23,24 @@
 #include "cmdhw.h"
 #include "cmdlf.h"
 #include "cmdmain.h"
 #include "cmdhw.h"
 #include "cmdlf.h"
 #include "cmdmain.h"

+#include "util.h"

 
 unsigned int current_command = CMD_UNKNOWN;
 
 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);
 
 
 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 '<command> help' for details of the following commands:\n"},
 static command_t CommandTable[] = 
 {
   {"help",  CmdHelp,  1, "This help. Use '<command> help' for details of the following commands:\n"},


@@ -54,38 +64,47 @@ int CmdQuit(const char *Cmd)
   exit(0);
   return 0;
 }
   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) {
+  
+  if (response == NULL) {
+    UsbCommand resp;
+    response = &resp;
+  }

 
 

-UsbCommand * WaitForResponseTimeout(uint32_t response_type, uint32_t ms_timeout) {
-       UsbCommand * ret =  NULL;
-       int i=0;
+  // Wait until the command is received
+  for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {

 
 

-       for(i=0; received_command != response_type && i < ms_timeout / 10; i++) {
-               msleep(10); // XXX ugh
+      if(getCommand(response) && response->cmd == cmd){
+          //We got what we expected
+          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");
+        }

        }
        }

-       
-       // There was an evil BUG
-       memcpy(&current_response_user, &current_response, sizeof(UsbCommand));
-       ret = &current_response_user;
-
-       if(received_command != response_type)
-               ret = NULL;
-
-       received_command = CMD_UNKNOWN;
-
-       return ret;
+    return false;

 }
 
 }
 

-UsbCommand * WaitForResponse(uint32_t response_type)
-{
-       return WaitForResponseTimeout(response_type, -1);
+bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
+       return WaitForResponseTimeout(cmd,response,-1);

 }
 
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
 //-----------------------------------------------------------------------------

-void CommandReceived(char *Cmd)
-{
+void CommandReceived(char *Cmd) {

   CmdsParse(CommandTable, Cmd);
 }
 
   CmdsParse(CommandTable, Cmd);
 }
 


@@ -95,23 +114,33 @@ void CommandReceived(char *Cmd)
 //-----------------------------------------------------------------------------
 void UsbCommandReceived(UsbCommand *UC)
 {
 //-----------------------------------------------------------------------------
 void UsbCommandReceived(UsbCommand *UC)
 {

+  /*
+  //  Debug
+  printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand));
+  printf("  cmd[len=%zd]: %"llx"\n",sizeof(UC->cmd),UC->cmd);
+  printf(" arg0[len=%zd]: %"llx"\n",sizeof(UC->arg[0]),UC->arg[0]);
+  printf(" arg1[len=%zd]: %"llx"\n",sizeof(UC->arg[1]),UC->arg[1]);
+  printf(" arg2[len=%zd]: %"llx"\n",sizeof(UC->arg[2]),UC->arg[2]);
+  printf(" data[len=%zd]: %02x%02x%02x...\n",sizeof(UC->d.asBytes),UC->d.asBytes[0],UC->d.asBytes[1],UC->d.asBytes[2]);
+  */
+

   //   printf("%s(%x) current cmd = %x\n", __FUNCTION__, c->cmd, current_command);
   //   printf("%s(%x) current cmd = %x\n", __FUNCTION__, c->cmd, current_command);

-  /* If we recognize a response, return to avoid further processing */
+  // If we recognize a response, return to avoid further processing

   switch(UC->cmd) {
   switch(UC->cmd) {

+      // First check if we are handling a debug message

     case CMD_DEBUG_PRINT_STRING: {
     case CMD_DEBUG_PRINT_STRING: {

-      char s[100];
-      if(UC->arg[0] > 70 || UC->arg[0] < 0) {
-        UC->arg[0] = 0;
-      }
-      memcpy(s, UC->d.asBytes, UC->arg[0]);
-      s[UC->arg[0]] = '\0';
-      PrintAndLog("#db# %s", s);
+      char s[USB_CMD_DATA_SIZE+1];
+      size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
+      memcpy(s,UC->d.asBytes,len);
+      s[len] = 0x00;
+      PrintAndLog("#db# %s       ", s);

       return;
       return;

-    }
+    } break;

 
 

-    case CMD_DEBUG_PRINT_INTEGERS:
-      PrintAndLog("#db# %08x, %08x, %08x\r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
+    case CMD_DEBUG_PRINT_INTEGERS: {
+      PrintAndLog("#db# %08x, %08x, %08x       \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);

       return;
       return;

+    } break;

 
     case CMD_MEASURED_ANTENNA_TUNING: {
       int peakv, peakf;
 
     case CMD_MEASURED_ANTENNA_TUNING: {
       int peakv, peakf;


@@ -122,7 +151,6 @@ void UsbCommandReceived(UsbCommand *UC)
       peakf = UC->arg[2] & 0xffff;
       peakv = UC->arg[2] >> 16;
       PrintAndLog("");
       peakf = UC->arg[2] & 0xffff;
       peakv = UC->arg[2] >> 16;
       PrintAndLog("");

-      PrintAndLog("");

       PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
       PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
       PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
       PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
       PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
       PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));


@@ -135,32 +163,84 @@ void UsbCommandReceived(UsbCommand *UC)
         PrintAndLog("# Your HF antenna is unusable.");
       else if (vHf<5000)
         PrintAndLog("# Your HF antenna is marginal.");
         PrintAndLog("# Your HF antenna is unusable.");
       else if (vHf<5000)
         PrintAndLog("# Your HF antenna is marginal.");

-      return;
+    } break;
+      
+    case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
+//      printf("received samples: ");
+//      print_hex(UC->d.asBytes,512);
+      sample_buf_len += UC->arg[1];
+//      printf("samples: %zd offset: %d\n",sample_buf_len,UC->arg[0]);
+      memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
+    } break;
+
+
+//    case CMD_ACK: {
+//      PrintAndLog("Receive ACK\n");
+//    } break;
+
+    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) {
+            PrintAndLog("unrecognized command %08x\n", UC->cmd);
+            break;
+          }
+//          int i;
+          PrintAndLog("received samples %d\n",UC->arg[0]);
+          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;
+        } break;
+
+        default: {
+        } break;
+      }*/

     }
     }

-    default:

       break;
   }
       break;
   }

-  /* 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(&current_response, UC, sizeof(UsbCommand));
-       received_command = UC->cmd;
-  }
+
+  storeCommand(UC);
+
+}
+/**
+ * @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;
+

 }
 }