mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: tools: add new function dump_addr_and_bytes()

Browse Source 
This function dumps <n> bytes from <addr> in hex form into buffer <buf>
enclosed in brackets after the address itself, formatted on 14 chars
including the "0x" prefix. This is meant to be used as a prefix for code
areas. For example: "0x7f10b6557690 [48 c7 c0 0f 00 00 00 0f]: "
It relies on may_access() to know if the bytes are dumpable, otherwise "--"
is emitted. An optional prefix is supported.
This commit is contained in:
Willy Tarreau 2020-03-03 15:57:10 +01:00
parent 55a6c4f34d
commit 762fb3ec8e
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/standard.h
View File

@ -1482,6 +1482,7 @@ int dump_text(struct buffer *out, const char *buf, int bsize);
int dump_binary(struct buffer *out, const char *buf, int bsize); int dump_binary(struct buffer *out, const char *buf, int bsize);
int dump_text_line(struct buffer *out, const char *buf, int bsize, int len, int dump_text_line(struct buffer *out, const char *buf, int bsize, int len,
int *line, int ptr); int *line, int ptr);
void dump_addr_and_bytes(struct buffer *buf, const char *pfx, const void *addr, int n);
void dump_hex(struct buffer *out, const char *pfx, const void *buf, int len, int unsafe); void dump_hex(struct buffer *out, const char *pfx, const void *buf, int len, int unsafe);
int may_access(const void *ptr); int may_access(const void *ptr);

25
src/standard.c
View File

@ -4191,6 +4191,31 @@ void dump_hex(struct buffer *out, const char *pfx, const void *buf, int len, int
} }
} }
/* dumps <pfx> followed by <n> bytes from <addr> in hex form into buffer <buf>
* enclosed in brackets after the address itself, formatted on 14 chars
* including the "0x" prefix. This is meant to be used as a prefix for code
* areas. For example:
* "0x7f10b6557690 [48 c7 c0 0f 00 00 00 0f]"
* It relies on may_access() to know if the bytes are dumpable, otherwise "--"
* is emitted. A NULL <pfx> will be considered empty.
*/
void dump_addr_and_bytes(struct buffer *buf, const char *pfx, const void *addr, int n)
{
int ok = 0;
int i;
chunk_appendf(buf, "%s%#14lx [", pfx ? pfx : "", (long)addr);
for (i = 0; i < n; i++) {
if (i == 0 || (((long)(addr + i) ^ (long)(addr)) & 4096))
ok = may_access(addr + i);
if (ok)
chunk_appendf(buf, "%02x%s", ((uint8_t*)addr)[i], (i<n-1) ? " " : "]");
else
chunk_appendf(buf, "--%s", (i<n-1) ? " " : "]");
}
}
/* print a line of text buffer (limited to 70 bytes) to <out>. The format is : /* print a line of text buffer (limited to 70 bytes) to <out>. The format is :
* <2 spaces> <offset=5 digits> <space or plus> <space> <70 chars max> <\n> * <2 spaces> <offset=5 digits> <space or plus> <space> <70 chars max> <\n>
* which is 60 chars per line. Non-printable chars \t, \n, \r and \e are * which is 60 chars per line. Non-printable chars \t, \n, \r and \e are