// Main command parser entry point
//-----------------------------------------------------------------------------
+#include "cmdmain.h"
+
+#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include "sleep.h"
#include "cmdparser.h"
#include "proxmark3.h"
#include "data.h"
#include "cmddata.h"
#include "cmdhw.h"
#include "cmdlf.h"
-#include "cmdmain.h"
#include "util.h"
+#include "util_posix.h"
#include "cmdscript.h"
+#include "cmdcrc.h"
unsigned int current_command = CMD_UNKNOWN;
-//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 CmdRev(const char *Cmd);
//For storing command that are received from the device
#define CMD_BUFFER_SIZE 50
static int cmd_head;//Starts as 0
//Points to the position of the last unread command
static int cmd_tail;//Starts as 0
+// to lock cmdBuffer operations from different threads
+static pthread_mutex_t cmdBufferMutex = PTHREAD_MUTEX_INITIALIZER;
static command_t CommandTable[] =
{
- {"help", CmdHelp, 1, "This help. Use '<command> help' for details of the following commands:\n"},
+ {"help", CmdHelp, 1, "This help. Use '<command> help' for details of a particular command."},
{"data", CmdData, 1, "{ Plot window / data buffer manipulation... }"},
- {"exit", CmdQuit, 1, "Exit program"},
- {"hf", CmdHF, 1, "{ HF commands... }"},
+ {"hf", CmdHF, 1, "{ High Frequency commands... }"},
{"hw", CmdHW, 1, "{ Hardware commands... }"},
- {"lf", CmdLF, 1, "{ LF commands... }"},
- {"quit", CmdQuit, 1, "Quit program"},
- {"script", CmdScript, 1,"Run script"},
+ {"lf", CmdLF, 1, "{ Low Frequency commands... }"},
+ {"reveng",CmdRev, 1, "Crc calculations from the software reveng1-30"},
+ {"script",CmdScript,1, "{ Scripting commands }"},
+ {"quit", CmdQuit, 1, "Exit program"},
+ {"exit", CmdQuit, 1, "Exit program"},
{NULL, NULL, 0, NULL}
};
+command_t* getTopLevelCommandTable()
+{
+ return CommandTable;
+}
int CmdHelp(const char *Cmd)
{
CmdsHelp(CommandTable);
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) {
-
- if (response == NULL) {
- UsbCommand resp;
- response = &resp;
- }
-
- // 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;
- }
-
- }
- 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;
+ return 99;
}
-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.
-//-----------------------------------------------------------------------------
-void CommandReceived(char *Cmd) {
- CmdsParse(CommandTable, Cmd);
-}
-
-//-----------------------------------------------------------------------------
-// Entry point into our code: called whenever we received a packet over USB
-// that we weren't necessarily expecting, for example a debug print.
-//-----------------------------------------------------------------------------
-void UsbCommandReceived(UsbCommand *UC)
+int CmdRev(const char *Cmd)
{
- /*
- // 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);
- // If we recognize a response, return to avoid further processing
- switch(UC->cmd) {
- // First check if we are handling a debug message
- case CMD_DEBUG_PRINT_STRING: {
- 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;
- } break;
-
- case CMD_DEBUG_PRINT_INTEGERS: {
- PrintAndLog("#db# %08x, %08x, %08x \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
- return;
- } break;
-
- case CMD_MEASURED_ANTENNA_TUNING: {
- int peakv, peakf;
- int vLf125, vLf134, vHf;
- vLf125 = UC->arg[0] & 0xffff;
- vLf134 = UC->arg[0] >> 16;
- vHf = UC->arg[1] & 0xffff;;
- peakf = UC->arg[2] & 0xffff;
- peakv = UC->arg[2] >> 16;
- 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("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0);
- if (peakv<2000)
- PrintAndLog("# Your LF antenna is unusable.");
- else if (peakv<10000)
- PrintAndLog("# Your LF antenna is marginal.");
- if (vHf<2000)
- PrintAndLog("# Your HF antenna is unusable.");
- else if (vHf<5000)
- PrintAndLog("# Your HF antenna is marginal.");
- } 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;
- }*/
- }
- break;
- }
-
- storeCommand(UC);
-
+ CmdCrc(Cmd);
+ return 0;
}
/**
void clearCommandBuffer()
{
//This is a very simple operation
+ pthread_mutex_lock(&cmdBufferMutex);
cmd_tail = cmd_head;
+ pthread_mutex_unlock(&cmdBufferMutex);
}
/**
*/
void storeCommand(UsbCommand *command)
{
+ pthread_mutex_lock(&cmdBufferMutex);
if( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail)
{
//If these two are equal, we're about to overwrite in the
memcpy(destination, command, sizeof(UsbCommand));
cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE; //increment head and wrap
-
+ pthread_mutex_unlock(&cmdBufferMutex);
}
+
+
/**
* @brief getCommand gets a command from an internal circular buffer.
* @param response location to write command
*/
int getCommand(UsbCommand* response)
{
+ pthread_mutex_lock(&cmdBufferMutex);
//If head == tail, there's nothing to read, or if we just got initialized
if(cmd_head == cmd_tail){
+ pthread_mutex_unlock(&cmdBufferMutex);
return 0;
}
//Pick out the next unread command
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;
-
+ pthread_mutex_unlock(&cmdBufferMutex);
return 1;
+}
+
+
+/**
+ * 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 WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning) {
+
+ UsbCommand resp;
+
+ if (response == NULL) {
+ response = &resp;
+ }
+ uint64_t start_time = msclock();
+
+ // Wait until the command is received
+ while (true) {
+ while(getCommand(response)) {
+ if(response->cmd == cmd){
+ return true;
+ }
+ }
+ if (msclock() - start_time > ms_timeout) {
+ break;
+ }
+ if (msclock() - start_time > 2000 && show_warning) {
+ PrintAndLog("Waiting for a response from the proxmark...");
+ PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
+ break;
+ }
+ }
+ return false;
}
+
+
+bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
+ return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
+}
+
+bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
+ return WaitForResponseTimeoutW(cmd, response, -1, true);
+}
+
+
+//-----------------------------------------------------------------------------
+// Entry point into our code: called whenever the user types a command and
+// then presses Enter, which the full command line that they typed.
+//-----------------------------------------------------------------------------
+int CommandReceived(char *Cmd) {
+ return CmdsParse(CommandTable, Cmd);
+}
+
+
+//-----------------------------------------------------------------------------
+// Entry point into our code: called whenever we received a packet over USB
+// that we weren't necessarily expecting, for example a debug print.
+//-----------------------------------------------------------------------------
+void UsbCommandReceived(UsbCommand *UC)
+{
+ switch(UC->cmd) {
+ // First check if we are handling a debug message
+ case CMD_DEBUG_PRINT_STRING: {
+ char s[USB_CMD_DATA_SIZE+1];
+ memset(s, 0x00, sizeof(s));
+ size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
+ memcpy(s,UC->d.asBytes,len);
+ PrintAndLog("#db# %s", s);
+ return;
+ } break;
+
+ case CMD_DEBUG_PRINT_INTEGERS: {
+ PrintAndLog("#db# %08x, %08x, %08x \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
+ return;
+ } break;
+
+ case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
+ memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
+ return;
+ } break;
+
+ default:
+ storeCommand(UC);
+ break;
+ }
+
+}
+
projects / proxmark3-svn / blobdiff