]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: debug messages go under conditionals 7938/head
authorMark Stapp <mjs@voltanet.io>
Tue, 26 Jan 2021 17:29:39 +0000 (12:29 -0500)
committerMark Stapp <mjs@voltanet.io>
Tue, 26 Jan 2021 17:29:39 +0000 (12:29 -0500)
Move a couple of unprotected debug calls in the netlink code
under DEBUG_KERNEL.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
zebra/kernel_netlink.c

index bbe2fccc60ac1c9980f38b337f8faf40b197292c..7d2f9e372d5a873c5986487405af2d014cb59421 100644 (file)
@@ -1136,9 +1136,11 @@ static int nl_batch_read_resp(struct nl_batch *bth)
                 * associated with any dplane context object.
                 */
                if (ctx == NULL) {
-                       zlog_debug(
-                               "%s: skipping unassociated response, seq number %d NS %u",
-                               __func__, h->nlmsg_seq, bth->zns->ns_id);
+                       if (IS_ZEBRA_DEBUG_KERNEL)
+                               zlog_debug(
+                                       "%s: skipping unassociated response, seq number %d NS %u",
+                                       __func__, h->nlmsg_seq,
+                                       bth->zns->ns_id);
                        continue;
                }
 
@@ -1149,8 +1151,9 @@ static int nl_batch_read_resp(struct nl_batch *bth)
                                dplane_ctx_set_status(
                                        ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 
-                       zlog_debug("%s: netlink error message seq=%d ",
-                                  __func__, h->nlmsg_seq);
+                       if (IS_ZEBRA_DEBUG_KERNEL)
+                               zlog_debug("%s: netlink error message seq=%d ",
+                                          __func__, h->nlmsg_seq);
                        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
                 * unexpected way.
                 */
-               zlog_debug("%s: ignoring message type 0x%04x(%s) NS %u",
-                          __func__, h->nlmsg_type,
-                          nl_msg_type_to_str(h->nlmsg_type), bth->zns->ns_id);
+               if (IS_ZEBRA_DEBUG_KERNEL)
+                       zlog_debug("%s: ignoring message type 0x%04x(%s) NS %u",
+                                  __func__, h->nlmsg_type,
+                                  nl_msg_type_to_str(h->nlmsg_type),
+                                  bth->zns->ns_id);
        }
 
        return 0;