From 0ab8e15fd7b5618c0c513c69ab6fd4155eb13452 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 11 Feb 2010 13:56:45 -0800 Subject: [PATCH] ofpbuf: New function ofpbuf_to_string(). Useful for debugging. From Jean Tourrilhes . --- lib/ofpbuf.c | 16 ++++++++++++++++ lib/ofpbuf.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c index fd01ea8d..9cb2ceb8 100644 --- a/lib/ofpbuf.c +++ b/lib/ofpbuf.c @@ -19,6 +19,7 @@ #include #include #include +#include "dynamic-string.h" #include "util.h" /* Initializes 'b' as an empty ofpbuf that contains the 'allocated' bytes of @@ -286,3 +287,18 @@ ofpbuf_try_pull(struct ofpbuf *b, size_t size) { return b->size >= size ? ofpbuf_pull(b, size) : NULL; } + +/* Returns a string that describes some of 'b''s metadata plus a hex dump of up + * to 'maxbytes' from the start of the buffer. */ +char * +ofpbuf_to_string(const struct ofpbuf *b, size_t maxbytes) +{ + struct ds s; + + ds_init(&s); + ds_put_format(&s, "size=%zu, allocated=%zu, head=%zu, tail=%zu\n", + b->size, b->allocated, + ofpbuf_headroom(b), ofpbuf_tailroom(b)); + ds_put_hex_dump(&s, b->data, MIN(b->size, maxbytes), 0, false); + return ds_cstr(&s); +} diff --git a/lib/ofpbuf.h b/lib/ofpbuf.h index b65f79ee..9072cc47 100644 --- a/lib/ofpbuf.h +++ b/lib/ofpbuf.h @@ -74,6 +74,8 @@ void ofpbuf_clear(struct ofpbuf *); void *ofpbuf_pull(struct ofpbuf *, size_t); void *ofpbuf_try_pull(struct ofpbuf *, size_t); +char *ofpbuf_to_string(const struct ofpbuf *, size_t maxbytes); + #ifdef __cplusplus } #endif -- 2.30.2