mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a logger dump function operating on a preallocated logger.

Browse Source
This commit is contained in:
Armin Novak 2019-02-26 15:31:47 +01:00
parent 0bba166020
commit 32aa11251b
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winpr/include/winpr/print.h
View File

@ -26,6 +26,7 @@
#include <winpr/winpr.h>
#include <winpr/wtypes.h>
#include <winpr/wlog.h>
#define WINPR_HEXDUMP_LINE_LENGTH 16
@ -33,8 +34,10 @@
extern "C" {
#endif
WINPR_API void winpr_HexDump(const char* tag, UINT32 lvl, const BYTE* data, int length);
WINPR_API void winpr_CArrayDump(const char* tag, UINT32 lvl, const BYTE* data, int length, int width);
WINPR_API void winpr_HexDump(const char* tag, UINT32 lvl, const BYTE* data, size_t length);
WINPR_API void winpr_HexLogDump(wLog* log, UINT32 lvl, const BYTE* data, size_t length);
WINPR_API void winpr_CArrayDump(const char* tag, UINT32 lvl, const BYTE* data, int length,
int width);
WINPR_API char* winpr_BinToHexString(const BYTE* data, int length, BOOL space);

30
winpr/libwinpr/utils/print.c
View File

@ -33,23 +33,35 @@
#include "../log.h"
void winpr_HexDump(const char* tag, UINT32 level, const BYTE* data, int length)
void winpr_HexDump(const char* tag, UINT32 level, const BYTE* data, size_t length)
{
wLog* log = WLog_Get(tag);
winpr_HexLogDump(log, level, data, length);
}
void winpr_HexLogDump(wLog* log, UINT32 lvl, const BYTE* data, size_t length)
{
const BYTE* p = data;
int i, line, offset = 0;
size_t blen = 7 + WINPR_HEXDUMP_LINE_LENGTH * 5;
size_t i, line, offset = 0;
size_t blen = 7 + WINPR_HEXDUMP_LINE_LENGTH * 6;
size_t pos = 0;
char* buffer = malloc(blen);
char* buffer;
if (!log)
return;
buffer = malloc(blen);
if (!buffer)
{
WLog_ERR(tag, "malloc(%"PRIuz") failed with [%d] %s", blen, errno, strerror(errno));
WLog_Print(log, WLOG_ERROR, "malloc(%"PRIuz") failed with [%"PRIuz"] %s", blen, errno,
strerror(errno));
return;
}
while (offset < length)
{
pos += trio_snprintf(&buffer[pos], blen - pos, "%04x ", offset);
pos += trio_snprintf(&buffer[pos], blen - pos, "%04"PRIuz" ", offset);
line = length - offset;
if (line > WINPR_HEXDUMP_LINE_LENGTH)
@ -63,14 +75,15 @@ void winpr_HexDump(const char* tag, UINT32 level, const BYTE* data, int length)
for (i = 0; i < line; i++)
pos += trio_snprintf(&buffer[pos], blen - pos, "%c",
(p[i] >= 0x20 && p[i] < 0x7F) ? (char) p[i] : '.');
(p[i] >= 0x20 && p[i] < 0x7F) ? (char) p[i] : '.');
WLog_LVL(tag, level, "%s", buffer);
WLog_Print(log, lvl, "%s", buffer);
offset += line;
p += line;
pos = 0;
}
WLog_Print(log, lvl, "[length=%"PRIuz"] ", length);
free(buffer);
}
@ -117,6 +130,7 @@ char* winpr_BinToHexString(const BYTE* data, int length, BOOL space)
char bin2hex[] = "0123456789ABCDEF";
n = space ? 3 : 2;
p = (char*) malloc((length + 1) * n);
if (!p)
return NULL;