Fix some printf/scanf format strings

[proxmark3-svn] / armsrc / BigBuf.c

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 703ade658da348db04f80b2824269a32c738cb55..ce97e41f0dc4c15de703896c9424c49841cd9078 100644 (file)
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -13,10 +13,19 @@
 #include "proxmark3.h"
 #include "apps.h"
 #include "string.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "string.h"

+#include "util.h"

 
 // BigBuf is the large multi-purpose buffer, typically used to hold A/D samples or traces.
 // Also used to hold various smaller buffers and the Mifare Emulator Memory.
 
 
 // BigBuf is the large multi-purpose buffer, typically used to hold A/D samples or traces.
 // Also used to hold various smaller buffers and the Mifare Emulator Memory.
 

+/* BigBuf memory layout:
+Pointer to highest available memory: BigBuf_hi
+
+       high BIGBUF_SIZE
+       reserved = BigBuf_malloc()  subtracts amount from BigBuf_hi,
+       low  0x00
+*/
+

 // declare it as uint32_t to achieve alignment to 4 Byte boundary
 static uint32_t BigBuf[BIGBUF_SIZE/sizeof(uint32_t)];
 
 // declare it as uint32_t to achieve alignment to 4 Byte boundary
 static uint32_t BigBuf[BIGBUF_SIZE/sizeof(uint32_t)];
 


@@ -27,8 +36,9 @@ static uint16_t BigBuf_hi = BIGBUF_SIZE;
 static uint8_t *emulator_memory = NULL;
 
 // trace related variables
 static uint8_t *emulator_memory = NULL;
 
 // trace related variables

-static uint16_t traceLen = 0;
-int tracing = 1; //Last global one.. todo static?
+static uint32_t traceLen = 0;
+static bool tracing = true;
+

 
 // get the address of BigBuf
 uint8_t *BigBuf_get_addr(void)
 
 // get the address of BigBuf
 uint8_t *BigBuf_get_addr(void)


@@ -40,10 +50,11 @@ uint8_t *BigBuf_get_addr(void)
 // get the address of the emulator memory. Allocate part of Bigbuf for it, if not yet done
 uint8_t *BigBuf_get_EM_addr(void)
 {
 // get the address of the emulator memory. Allocate part of Bigbuf for it, if not yet done
 uint8_t *BigBuf_get_EM_addr(void)
 {

-       if (emulator_memory == NULL) {          // not yet allocated
+       // not yet allocated
+       if (emulator_memory == NULL) {

                emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
        }
                emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
        }

-       
+

        return emulator_memory;
 }
 
        return emulator_memory;
 }
 


@@ -51,20 +62,38 @@ uint8_t *BigBuf_get_EM_addr(void)
 // clear ALL of BigBuf
 void BigBuf_Clear(void)
 {
 // clear ALL of BigBuf
 void BigBuf_Clear(void)
 {

-       memset(BigBuf,0,BIGBUF_SIZE);
-       Dbprintf("Buffer cleared (%i bytes)",BIGBUF_SIZE);
+       BigBuf_Clear_ext(true);
+}
+
+
+// clear ALL of BigBuf
+void BigBuf_Clear_ext(bool verbose)
+{
+       memset(BigBuf, 0, BIGBUF_SIZE);
+       if (verbose)
+               Dbprintf("Buffer cleared (%i bytes)", BIGBUF_SIZE);
+}
+
+
+void BigBuf_Clear_EM(void){
+       memset(BigBuf_get_EM_addr(), 0, CARD_MEMORY_SIZE);

 }
 
 
 }
 
 

+void BigBuf_Clear_keep_EM(void)
+{
+       memset(BigBuf, 0, BigBuf_hi);
+}
+

 // allocate a chunk of memory from BigBuf. We allocate high memory first. The unallocated memory
 // at the beginning of BigBuf is always for traces/samples
 uint8_t *BigBuf_malloc(uint16_t chunksize)
 {
 // allocate a chunk of memory from BigBuf. We allocate high memory first. The unallocated memory
 // at the beginning of BigBuf is always for traces/samples
 uint8_t *BigBuf_malloc(uint16_t chunksize)
 {

-       if (BigBuf_hi - chunksize < 0) { 
-               return NULL;                                                    // no memory left
+       if (BigBuf_hi - chunksize < 0) {
+               return NULL;                            // no memory left

        } else {
        } else {

-               chunksize = (chunksize + 3) & 0xfffc;   // round to next multiple of 4
-               BigBuf_hi -= chunksize;                                 // aligned to 4 Byte boundary 
+               chunksize = (chunksize + 3) & 0xfffc;   // round to next multiple of 4
+               BigBuf_hi -= chunksize;                 // aligned to 4 Byte boundary

                return (uint8_t *)BigBuf + BigBuf_hi;
        }
 }
                return (uint8_t *)BigBuf + BigBuf_hi;
        }
 }


@@ -88,6 +117,16 @@ void BigBuf_free_keep_EM(void)
        }
 }
 
        }
 }
 

+void BigBuf_print_status(void)
+{
+       Dbprintf("Memory");
+       Dbprintf("  BIGBUF_SIZE.............%d", BIGBUF_SIZE);
+       Dbprintf("  Available memory........%d", BigBuf_hi);
+       Dbprintf("Tracing");
+       Dbprintf("  tracing ................%d", tracing);
+       Dbprintf("  traceLen ...............%d", traceLen);
+}
+

 
 // return the maximum trace length (i.e. the unallocated size of BigBuf)
 uint16_t BigBuf_max_traceLen(void)
 
 // return the maximum trace length (i.e. the unallocated size of BigBuf)
 uint16_t BigBuf_max_traceLen(void)


@@ -95,17 +134,22 @@ uint16_t BigBuf_max_traceLen(void)
        return BigBuf_hi;
 }
 
        return BigBuf_hi;
 }
 

+

 void clear_trace() {
 void clear_trace() {

-       uint8_t *trace = BigBuf_get_addr();
-       uint16_t max_traceLen = BigBuf_max_traceLen();
-       memset(trace, 0x44, max_traceLen);

        traceLen = 0;
 }
 
        traceLen = 0;
 }
 

+

 void set_tracing(bool enable) {
        tracing = enable;
 }
 
 void set_tracing(bool enable) {
        tracing = enable;
 }
 

+
+bool get_tracing(void) {
+       return tracing;
+}
+
+

 /**
  * Get the number of bytes traced
  * @return
 /**
  * Get the number of bytes traced
  * @return


@@ -115,6 +159,7 @@ uint16_t BigBuf_get_traceLen(void)
        return traceLen;
 }
 
        return traceLen;
 }
 

+

 /**
   This is a function to store traces. All protocols can use this generic tracer-function.
   The traces produced by calling this function can be fetched on the client-side
 /**
   This is a function to store traces. All protocols can use this generic tracer-function.
   The traces produced by calling this function can be fetched on the client-side


@@ -124,19 +169,19 @@ uint16_t BigBuf_get_traceLen(void)
 **/
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag)
 {
 **/
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag)
 {

-       if (!tracing) return FALSE;
+       if (!tracing) return false;

 
        uint8_t *trace = BigBuf_get_addr();
 
 
        uint8_t *trace = BigBuf_get_addr();
 

-       uint16_t num_paritybytes = (iLen-1)/8 + 1;      // number of valid paritybytes in *parity
-       uint16_t duration = timestamp_end - timestamp_start;
+       uint32_t num_paritybytes = (iLen-1)/8 + 1;  // number of valid paritybytes in *parity
+       uint32_t duration = timestamp_end - timestamp_start;

 
        // Return when trace is full
        uint16_t max_traceLen = BigBuf_max_traceLen();
 
        if (traceLen + sizeof(iLen) + sizeof(timestamp_start) + sizeof(duration) + num_paritybytes + iLen >= max_traceLen) {
 
        // Return when trace is full
        uint16_t max_traceLen = BigBuf_max_traceLen();
 
        if (traceLen + sizeof(iLen) + sizeof(timestamp_start) + sizeof(duration) + num_paritybytes + iLen >= max_traceLen) {

-               tracing = FALSE;        // don't trace any more
-               return FALSE;
+               tracing = false;    // don't trace any more
+               return false;

        }
        // Traceformat:
        // 32 bits timestamp (little endian)
        }
        // Traceformat:
        // 32 bits timestamp (little endian)


@@ -166,23 +211,28 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
 
        // data bytes
        if (btBytes != NULL && iLen != 0) {
 
        // data bytes
        if (btBytes != NULL && iLen != 0) {

-               memcpy(trace + traceLen, btBytes, iLen);
+               for (int i = 0; i < iLen; i++) {
+                       trace[traceLen++] = *btBytes++;
+               }

        }
        }

-       traceLen += iLen;

 
        // parity bytes
 
        // parity bytes

-       if (parity != NULL && iLen != 0) {
-               memcpy(trace + traceLen, parity, num_paritybytes);
+       if (num_paritybytes != 0) {
+               if (parity != NULL) {
+                       for (int i = 0; i < num_paritybytes; i++) {
+                               trace[traceLen++] = *parity++;
+                       }
+               } else {
+                       for (int i = 0; i < num_paritybytes; i++) {
+                               trace[traceLen++] = 0x00;
+                       }
+               }

        }
        }

-       traceLen += num_paritybytes;

 
 

-       if(traceLen +4 < max_traceLen)
-       {       //If it hadn't been cleared, for whatever reason..
-               memset(trace+traceLen,0x44, 4);
-       }
-
-       return TRUE;
+       return true;

 }
 }

+
+

 int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag)
 {
        /**
 int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag)
 {
        /**


@@ -190,12 +240,15 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
          that this logger takes number of bits as argument, not number of bytes.
          **/
 
          that this logger takes number of bits as argument, not number of bytes.
          **/
 

-       if (!tracing) return FALSE;
+       if (!tracing) return false;

 
        uint8_t *trace = BigBuf_get_addr();
        uint16_t iLen = nbytes(iBits);
 
        uint8_t *trace = BigBuf_get_addr();
        uint16_t iLen = nbytes(iBits);

+

        // Return when trace is full
        // Return when trace is full

-       if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) return FALSE;
+       if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) {
+               return false;
+       }

 
        //Hitag traces appear to use this traceformat:
        // 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)
 
        //Hitag traces appear to use this traceformat:
        // 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)


@@ -203,6 +256,8 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
        // 8 bits size (number of bits in the trace entry, not number of bytes)
        // y Bytes data
 
        // 8 bits size (number of bits in the trace entry, not number of bytes)
        // y Bytes data
 

+
+

        rsamples += iSamples;
        trace[traceLen++] = ((rsamples >> 0) & 0xff);
        trace[traceLen++] = ((rsamples >> 8) & 0xff);
        rsamples += iSamples;
        trace[traceLen++] = ((rsamples >> 0) & 0xff);
        trace[traceLen++] = ((rsamples >> 8) & 0xff);


@@ -219,20 +274,21 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
        trace[traceLen++] = ((dwParity >> 24) & 0xff);
        trace[traceLen++] = iBits;
 
        trace[traceLen++] = ((dwParity >> 24) & 0xff);
        trace[traceLen++] = iBits;
 

-       memcpy(trace + traceLen, btBytes, iLen);
-       traceLen += iLen;
+       for (int i = 0; i < iLen; i++) {
+               trace[traceLen++] = *btBytes++;
+       }

 
 

-       return TRUE;
+       return true;

 }
 }

+
+

 // Emulator memory
 uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length){
        uint8_t* mem = BigBuf_get_EM_addr();
 // Emulator memory
 uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length){
        uint8_t* mem = BigBuf_get_EM_addr();

-       if(offset+length < CARD_MEMORY_SIZE)
-       {
+       if (offset+length < CARD_MEMORY_SIZE) {

                memcpy(mem+offset, data, length);
                return 0;
                memcpy(mem+offset, data, length);
                return 0;

-       }else
-       {
+       } else {

                Dbprintf("Error, trying to set memory outside of bounds! %d  > %d", (offset+length), CARD_MEMORY_SIZE);
                return 1;
        }
                Dbprintf("Error, trying to set memory outside of bounds! %d  > %d", (offset+length), CARD_MEMORY_SIZE);
                return 1;
        }