github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chg: 'trace save' - now uses fileutils.c instead.

Browse source
This commit is contained in:
iceman1001 2018-03-20 08:23:54 +01:00
commit b5545f4c35
3 changed files with 9 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

48
client/cmdtrace.c
View file

@ -539,8 +539,6 @@ int CmdTraceList(const char *Cmd) {
int CmdTraceLoad(const char *Cmd) { int CmdTraceLoad(const char *Cmd) {
FILE *f = NULL; FILE *f = NULL;
size_t bytes_read;
uint8_t buf[2];
char filename[FILE_PATH_SIZE]; char filename[FILE_PATH_SIZE];
char cmdp = param_getchar(Cmd, 0); char cmdp = param_getchar(Cmd, 0);
if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load(); if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load();
@ -562,43 +560,19 @@ int CmdTraceLoad(const char *Cmd) {
fclose(f); fclose(f);
return 3; return 3;
} }
// iceman, RDV40 be able to log much bigger than 64kb.
// so this two byte limit will have a magic value (above 40kb limit from bigbuff)
// or we just skip this limit at all
bytes_read = fread(buf, 1, 2, f);
if (bytes_read != 2) {
PrintAndLogEx(FAILED, "error, when reading dumpsize");
fclose(f);
return 1;
}
if ( trace ) if ( trace )
free(trace); free(trace);
// old dumpsize two first bytes of file trace = malloc(fsize);
traceLen = bytes_to_num(buf, 2); // little endian in file
// RDV40 will have bigger traces
if (fsize > traceLen + 2 ){
traceLen = fsize;
trace = malloc(fsize);
} else {
trace = malloc(traceLen+2);
}
if (trace == NULL) { if (trace == NULL) {
PrintAndLogEx(FAILED, "Cannot allocate memory for trace"); PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
fclose(f); fclose(f);
return 2; return 2;
} }
bytes_read = fread(trace, 1, traceLen, f); size_t bytes_read = fread(trace, 1, fsize, f);
if (bytes_read != traceLen) { traceLen = bytes_read;
PrintAndLogEx(FAILED, "File reading error. %d -- %d", bytes_read, traceLen);
fclose(f);
return 1;
}
fclose(f); fclose(f);
PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) loaded from file %s", traceLen, filename); PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) loaded from file %s", traceLen, filename);
return 0; return 0;
@ -611,26 +585,14 @@ int CmdTraceSave(const char *Cmd) {
return 0; return 0;
} }
FILE *f = NULL;
uint8_t buf[2] = {0x01, 0xCE};
char filename[FILE_PATH_SIZE]; char filename[FILE_PATH_SIZE];
char cmdp = param_getchar(Cmd, 0); char cmdp = param_getchar(Cmd, 0);
if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_save(); if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_save();
param_getstr(Cmd, 0, filename, sizeof(filename)); param_getstr(Cmd, 0, filename, sizeof(filename));
if ((f = fopen(filename, "wb")) == NULL) { saveFile(filename, "bin", trace, traceLen);
PrintAndLogEx(FAILED, "Could not create file %s", filename);
return 1;
}
// 40kb bigbuffer limit
if ( traceLen <= 40000 ) {
num_to_bytes(traceLen, 2, buf);
}
fwrite(buf, 1, 2, f);
fwrite(trace, 1, traceLen, f);
fclose(f);
PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) written to file %s", traceLen, filename); PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) written to file %s", traceLen, filename);
return 0; return 0;
} }

1
client/cmdtrace.h
View file

@ -26,6 +26,7 @@
#include "cmdparser.h" // for getting cli commands included in cmdmain.h #include "cmdparser.h" // for getting cli commands included in cmdmain.h
#include "cmdmain.h" // for sending cmds to device #include "cmdmain.h" // for sending cmds to device
#include "data.h" // for GetFromBigBuf #include "data.h" // for GetFromBigBuf
#include "loclass/fileutils.h" // for saveFile
extern int CmdTrace(const char *Cmd); extern int CmdTrace(const char *Cmd);

9
client/loclass/fileutils.c
View file

@ -60,8 +60,7 @@ int fileExists(const char *filename) {
return result == 0; return result == 0;
} }
int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen) int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen) {
{
int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10); int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
char * fileName = malloc(size); char * fileName = malloc(size);
@ -147,8 +146,7 @@ out:
* write also to a logfile. When doing so, just delete this function. * write also to a logfile. When doing so, just delete this function.
* @param fmt * @param fmt
*/ */
void PrintAndLogDevice(logLevel_t level, char *fmt, ...) void PrintAndLogDevice(logLevel_t level, char *fmt, ...) {
{
char buffer[2048] = {0}; char buffer[2048] = {0};
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
@ -157,8 +155,7 @@ void PrintAndLogDevice(logLevel_t level, char *fmt, ...)
PrintAndLogEx(level, buffer); PrintAndLogEx(level, buffer);
} }
#else //if we're on ARM #else //if we're on ARM
void PrintAndLogDevice(logLevel_t level, char *fmt,...) void PrintAndLogDevice(logLevel_t level, char *fmt, ...) {
{
return; return;
} }