sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-06 13:18:07 +03:00
Code

lib/util: add dump_data_diff*() helpers

Browse Source 
That will make it easy to see the difference
between two memory buffers.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14956

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit b489b7feda)
This commit is contained in:
Stefan Metzmacher 2021-11-03 11:40:13 +01:00 committed by Jule Anger
parent 7b844ab490
commit 7b96fe7e12
2 changed files with 112 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
lib/util/util.c
View File

@ -614,6 +614,90 @@ void dump_data_file(const uint8_t *buf, int len, bool omit_zero_bytes,
dump_data_cb(buf, len, omit_zero_bytes, fprintf_cb, f);
}
/**
* Write dump of compared binary data to a callback
*/
void dump_data_diff_cb(const uint8_t *buf1, size_t len1,
const uint8_t *buf2, size_t len2,
bool omit_zero_bytes,
void (*cb)(const char *buf, void *private_data),
void *private_data)
{
size_t len = MAX(len1, len2);
size_t i;
bool skipped = false;
for (i=0; i<len; i+=16) {
size_t remaining_len = len - i;
size_t remaining_len1 = 0;
size_t this_len1 = 0;
const uint8_t *this_buf1 = NULL;
size_t remaining_len2 = 0;
size_t this_len2 = 0;
const uint8_t *this_buf2 = NULL;
if (i < len1) {
remaining_len1 = len1 - i;
this_len1 = MIN(remaining_len1, 16);
this_buf1 = &buf1[i];
}
if (i < len2) {
remaining_len2 = len2 - i;
this_len2 = MIN(remaining_len2, 16);
this_buf2 = &buf2[i];
}
if ((omit_zero_bytes == true) &&
(i > 0) && (remaining_len > 16) &&
(this_len1 == 16) && all_zero(this_buf1, 16) &&
(this_len2 == 16) && all_zero(this_buf2, 16))
{
if (!skipped) {
cb("skipping zero buffer bytes\n",
private_data);
skipped = true;
}
continue;
}
skipped = false;
if ((this_len1 == this_len2) &&
(memcmp(this_buf1, this_buf2, this_len1) == 0))
{
dump_data_block16(" ", i, this_buf1, this_len1,
cb, private_data);
continue;
}
dump_data_block16("-", i, this_buf1, this_len1,
cb, private_data);
dump_data_block16("+", i, this_buf2, this_len2,
cb, private_data);
}
}
_PUBLIC_ void dump_data_diff(int dbgc_class, int level,
bool omit_zero_bytes,
const uint8_t *buf1, size_t len1,
const uint8_t *buf2, size_t len2)
{
struct debug_channel_level dcl = { dbgc_class, level };
if (!DEBUGLVLC(dbgc_class, level)) {
return;
}
dump_data_diff_cb(buf1, len1, buf2, len2, true, debugadd_channel_cb, &dcl);
}
_PUBLIC_ void dump_data_file_diff(FILE *f,
bool omit_zero_bytes,
const uint8_t *buf1, size_t len1,
const uint8_t *buf2, size_t len2)
{
dump_data_diff_cb(buf1, len1, buf2, len2, omit_zero_bytes, fprintf_cb, f);
}
/**
malloc that aborts with smb_panic on fail or zero size.
**/

28
lib/util/util.h
View File

@ -51,4 +51,32 @@ _PUBLIC_ void dump_data(int level, const uint8_t *buf,int len);
*/
_PUBLIC_ void dump_data_dbgc(int dbgc_class, int level, const uint8_t *buf, int len);
/**
* Write dump of compared binary data to a callback
*/
void dump_data_diff_cb(const uint8_t *buf1, size_t len1,
const uint8_t *buf2, size_t len2,
bool omit_zero_bytes,
void (*cb)(const char *buf, void *private_data),
void *private_data);
/**
* Write dump of compared binary data to the log file.
*
* The data is only written if the log level is at least level for
* debug class dbgc_class.
*/
_PUBLIC_ void dump_data_diff(int dbgc_class, int level,
bool omit_zero_bytes,
const uint8_t *buf1, size_t len1,
const uint8_t *buf2, size_t len2);
/**
* Write dump of compared binary data to the given file handle
*/
_PUBLIC_ void dump_data_file_diff(FILE *f,
bool omit_zero_bytes,
const uint8_t *buf1, size_t len1,
const uint8_t *buf2, size_t len2);
#endif