zebra, lib: bugfix on zebra packet debugging

`debug zebra packet detail` dumps the full message whereas
it had been dropping exactly 10 bytes, the size of the zebra header

Signed-off-by: Wesley Coakley <wcoakley@cumulusnetworks.com>

diff --git a/lib/stream.c b/lib/stream.c
index 683a130e446fd0c21150f3a1cd2b6fad2c6e359b..b378ab62a5094e017a91fd9f0bb194d0b65bdd53 100644 (file)
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -1122,6 +1122,11 @@ int stream_flush(struct stream *s, int fd)
        return nbytes;
 }
 
+void stream_hexdump(struct stream *s)
+{
+       zlog_hexdump(s->data, s->endp);
+}
+
 /* Stream first in first out queue. */
 
 struct stream_fifo *stream_fifo_new(void)

diff --git a/lib/stream.h b/lib/stream.h
index 5c7d94fab8f822978e29f04767fa5c2db5c50dda..f84f028852a21a994670ebc4355860bb026ac375 100644 (file)
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -252,6 +252,9 @@ extern void stream_reset(struct stream *);
 extern int stream_flush(struct stream *, int);
 extern int stream_empty(struct stream *); /* is the stream empty? */
 
+/* debugging */
+extern void stream_hexdump(struct stream *);
+
 /* deprecated */
 extern uint8_t *stream_pnt(struct stream *);
 

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 8a1ed115a7f99fd37377c67773896f9b1aa3dc9b..9d6ae2ec2e229fee23b371efe2c0ffcc08b3904f 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -160,7 +160,7 @@ void zserv_log_message(const char *errmsg, struct stream *msg,
                zlog_debug("Command: %s", zserv_command_string(hdr->command));
                zlog_debug("    VRF: %u", hdr->vrf_id);
        }
-       zlog_hexdump(msg->data, STREAM_READABLE(msg));
+       stream_hexdump(msg);
 }
 
 /*