1
0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-11-17 20:01:54 +02:00

tools/dirtpan/: -d now generates terse output; -d -d dumps full content

- dirtpan.c (debug_ip): only dump local packets if debug > 1
- dirtpan.c (debug_dirt): dump packet content only if debug > 1
- dirtpan.c (debug_dirt): made packet content dump more readable
- dirtpan.c (debug_dirt): added terse debug output for debug == 1
- dirtpan.c (usage): doubling -d now has a meaning
This commit is contained in:
Werner Almesberger 2011-05-11 14:15:45 -03:00
parent dbad7ae887
commit 29e56c77ac

View File

@ -110,7 +110,7 @@ static void dump(const void *buf, int size)
static void debug_ip(const char *label, void *buf, int size) static void debug_ip(const char *label, void *buf, int size)
{ {
if (!debug) if (debug < 2)
return; return;
debug_label(label); debug_label(label);
fprintf(stderr, ", %d: ", size); fprintf(stderr, ", %d: ", size);
@ -125,10 +125,18 @@ static void debug_dirt(const char *label, void *buf, int size)
if (!debug) if (!debug)
return; return;
debug_label(label); if (debug == 1) {
fprintf(stderr, ", %d", size);
if (size) { if (size) {
fprintf(stderr, ": %02x(%c%d) ", fprintf(stderr, "%c%d",
(label[1] == '>' ? "FNA?" : "fna?")[*p & PT_MASK],
*p & SEQ ? 0 : 1);
}
return;
}
debug_label(label);
fprintf(stderr, ", %d+1: ", size-1);
if (size) {
fprintf(stderr, "%02x(%c%d) | ",
*p, "FNA?"[*p & PT_MASK], *p & SEQ ? 0 : 1); *p, "FNA?"[*p & PT_MASK], *p & SEQ ? 0 : 1);
dump(buf+1, size-1); dump(buf+1, size-1);
} }
@ -481,7 +489,8 @@ static int open_tun(void)
static void usage(const char *name) static void usage(const char *name)
{ {
fprintf(stderr, "usage: %s [-d] pan_id src_addr dst_addr\n", name); fprintf(stderr, "usage: %s [-d [-d]] pan_id src_addr dst_addr\n",
name);
exit(1); exit(1);
} }