Merge pull request #511 from donaldsharp/netlink_dump

zebra: Fix kernel netlink hex dump of information
This commit is contained in:
Jafar Al-Gharaibeh 2017-05-11 22:47:22 -05:00 committed by GitHub
commit a153bd94bc
2 changed files with 12 additions and 2 deletions

View File

@ -384,6 +384,16 @@ config_write_debug (struct vty *vty)
vty_out (vty, "debug zebra kernel%s", VTY_NEWLINE); vty_out (vty, "debug zebra kernel%s", VTY_NEWLINE);
write++; write++;
} }
if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV)
{
vty_out (vty, "debug zebra kernel msgdump recv%s", VTY_NEWLINE);
write++;
}
if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND)
{
vty_out (vty, "debug zebra kernel msgdump send%s", VTY_NEWLINE);
write++;
}
/* Check here using flags as the 'macro' does an OR */ /* Check here using flags as the 'macro' does an OR */
if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB)) if (CHECK_FLAG (zebra_debug_rib, ZEBRA_DEBUG_RIB))
{ {

View File

@ -522,7 +522,7 @@ netlink_parse_info (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV) if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV)
{ {
zlog_debug("%s: << netlink message dump [recv]", __func__); zlog_debug("%s: << netlink message dump [recv]", __func__);
zlog_hexdump(&msg, sizeof(msg)); zlog_hexdump(buf, status);
} }
read_in++; read_in++;
@ -705,7 +705,7 @@ netlink_talk (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND) if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND)
{ {
zlog_debug("%s: >> netlink message dump [sent]", __func__); zlog_debug("%s: >> netlink message dump [sent]", __func__);
zlog_hexdump(&msg, sizeof(msg)); zlog_hexdump(n, n->nlmsg_len);
} }
if (status < 0) if (status < 0)