matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

zebra: debug messages go under conditionals

Browse source 
Move a couple of unprotected debug calls in the netlink code
under DEBUG_KERNEL.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2021-01-26 12:29:39 -05:00
parent 72bd11663f
commit 4c99d413e6
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
zebra/kernel_netlink.c
View file

@ -1136,9 +1136,11 @@ static int nl_batch_read_resp(struct nl_batch *bth)
* associated with any dplane context object. * associated with any dplane context object.
*/ */
if (ctx == NULL) { if (ctx == NULL) {
zlog_debug( if (IS_ZEBRA_DEBUG_KERNEL)
"%s: skipping unassociated response, seq number %d NS %u", zlog_debug(
__func__, h->nlmsg_seq, bth->zns->ns_id); "%s: skipping unassociated response, seq number %d NS %u",
__func__, h->nlmsg_seq,
bth->zns->ns_id);
continue; continue;
} }
@ -1149,8 +1151,9 @@ static int nl_batch_read_resp(struct nl_batch *bth)
dplane_ctx_set_status( dplane_ctx_set_status(
ctx, ZEBRA_DPLANE_REQUEST_FAILURE); ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
zlog_debug("%s: netlink error message seq=%d ", if (IS_ZEBRA_DEBUG_KERNEL)
__func__, h->nlmsg_seq); zlog_debug("%s: netlink error message seq=%d ",
__func__, h->nlmsg_seq);
continue; continue;
} }
@ -1159,9 +1162,11 @@ static int nl_batch_read_resp(struct nl_batch *bth)
* the error and instead received some other message in an * the error and instead received some other message in an
* unexpected way. * unexpected way.
*/ */
zlog_debug("%s: ignoring message type 0x%04x(%s) NS %u", if (IS_ZEBRA_DEBUG_KERNEL)
__func__, h->nlmsg_type, zlog_debug("%s: ignoring message type 0x%04x(%s) NS %u",
nl_msg_type_to_str(h->nlmsg_type), bth->zns->ns_id); __func__, h->nlmsg_type,
nl_msg_type_to_str(h->nlmsg_type),
bth->zns->ns_id);
} }
return 0; return 0;