]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf.c
Minor documentation on 'hf list'
[proxmark3-svn] / client / cmdhf.c
index fbc2d7b257a8312ac42412aa6d5265c34c44e982..a55c41b2bbe2d209eec7a8d468488cebd1f29e78 100644 (file)
@@ -32,8 +32,6 @@ int CmdHFTune(const char *Cmd)
   SendCommand(&c);
   return 0;
 }
-// for the time being. Need better Bigbuf handling.
-#define TRACE_SIZE 3000
 
 //The following data is taken from http://www.proxmark.org/forum/viewtopic.php?pid=13501#p13501
 /*
@@ -384,18 +382,18 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
        }
 }
 
-uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, bool showWaitCycles)
+uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles)
 {
        bool isResponse;
-       uint16_t duration, data_len,parity_len;
+       uint16_t duration, data_len, parity_len;
 
        uint32_t timestamp, first_timestamp, EndOfTransmissionTimestamp;
        char explanation[30] = {0};
 
+       if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
+       
        first_timestamp = *((uint32_t *)(trace));
        timestamp = *((uint32_t *)(trace + tracepos));
-       // Break and stick with current result if buffer was not completely full
-       if (timestamp == 0x44444444) return TRACE_SIZE;
 
        tracepos += 4;
        duration = *((uint16_t *)(trace + tracepos));
@@ -411,8 +409,8 @@ uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, boo
        }
        parity_len = (data_len-1)/8 + 1;
 
-       if (tracepos + data_len + parity_len >= TRACE_SIZE) {
-               return TRACE_SIZE;
+       if (tracepos + data_len + parity_len > traceLen) {
+               return traceLen;
        }
 
        uint8_t *frame = trace + tracepos;
@@ -498,6 +496,8 @@ uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, boo
                }
        }
 
+       if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
+       
        bool next_isResponse = *((uint16_t *)(trace + tracepos + 6)) & 0x8000;
 
        if (showWaitCycles && !isResponse && next_isResponse) {
@@ -510,9 +510,11 @@ uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, boo
                                (next_timestamp - EndOfTransmissionTimestamp));
                }
        }
+
        return tracepos;
 }
 
+
 int CmdHFList(const char *Cmd)
 {
        bool showWaitCycles = false;
@@ -552,12 +554,13 @@ int CmdHFList(const char *Cmd)
 
        if (errors) {
                PrintAndLog("List protocol data in trace buffer.");
-               PrintAndLog("Usage:  hf list [14a|14b|iclass] [f]");
+               PrintAndLog("Usage:  hf list <protocol> [f]");
+               PrintAndLog("    f      - show frame delay times as well");
+               PrintAndLog("Supported <protocol> values:");
+               PrintAndLog("    raw    - just show raw data without annotations");
                PrintAndLog("    14a    - interpret data as iso14443a communications");
                PrintAndLog("    14b    - interpret data as iso14443b communications");
                PrintAndLog("    iclass - interpret data as iclass communications");
-               PrintAndLog("    raw    - just show raw data");
-               PrintAndLog("    f      - show frame delay times as well");
                PrintAndLog("");
                PrintAndLog("example: hf list 14a f");
                PrintAndLog("example: hf list iclass");
@@ -570,12 +573,28 @@ int CmdHFList(const char *Cmd)
        }
 
 
-       uint8_t trace[TRACE_SIZE];
+       uint8_t *trace;
        uint16_t tracepos = 0;
-       GetFromBigBuf(trace, TRACE_SIZE, 0);
-       WaitForResponse(CMD_ACK, NULL);
-
-       PrintAndLog("Recorded Activity");
+       trace = malloc(USB_CMD_DATA_SIZE);
+
+       // Query for the size of the trace
+       UsbCommand response;
+       GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0);
+       WaitForResponse(CMD_ACK, &response);
+       uint16_t traceLen = response.arg[2];
+       if (traceLen > USB_CMD_DATA_SIZE) {
+               uint8_t *p = realloc(trace, traceLen);
+               if (p == NULL) {
+                       PrintAndLog("Cannot allocate memory for trace");
+                       free(trace);
+                       return 2;
+               }
+               trace = p;
+               GetFromBigBuf(trace, traceLen, 0);
+               WaitForResponse(CMD_ACK, NULL);
+       }
+       
+       PrintAndLog("Recorded Activity (TraceLen = %d bytes)", traceLen);
        PrintAndLog("");
        PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
        PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
@@ -584,10 +603,12 @@ int CmdHFList(const char *Cmd)
        PrintAndLog("     Start |       End | Src | Data (! denotes parity error)                                   | CRC | Annotation         |");
        PrintAndLog("-----------|-----------|-----|-----------------------------------------------------------------|-----|--------------------|");
 
-       while(tracepos < TRACE_SIZE)
+       while(tracepos < traceLen)
        {
-               tracepos = printTraceLine(tracepos, trace, protocol, showWaitCycles);
+               tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles);
        }
+
+       free(trace);
        return 0;
 }
 
Impressum, Datenschutz