diff options
| author | Rafael Zalamena <rzalamena@opensourcerouting.org> | 2019-01-17 13:12:13 -0200 |
|---|---|---|
| committer | Rafael Zalamena <rzalamena@opensourcerouting.org> | 2019-01-21 07:32:39 -0200 |
| commit | 31be7dbbc5dae175a35a66a7da4b516ec9124bb8 (patch) | |
| tree | ad6cdecdcf5a459cfbd08f5aa6b94aca094b7812 | |
| parent | e228ca1247363d548326e38590f8e9391b31b649 (diff) | |
zebra: fix debug messages with prefixes
Debug messages should use `prefix_buf` and `prefix2str` should only be
called once in `kernel_rtm`.
Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
| -rw-r--r-- | zebra/rt_socket.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index 29e9bf82f0..08f9a2c719 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -131,7 +131,7 @@ static int kernel_rtm(int cmd, const struct prefix *p, char prefix_buf[PREFIX_STRLEN]; enum blackhole_type bh_type = BLACKHOLE_UNSPEC; - if (IS_ZEBRA_DEBUG_RIB) + if (IS_ZEBRA_DEBUG_RIB || IS_ZEBRA_DEBUG_KERNEL) prefix2str(p, prefix_buf, sizeof(prefix_buf)); /* @@ -301,12 +301,11 @@ static int kernel_rtm(int cmd, const struct prefix *p, /* Note any unexpected status returns */ default: - flog_err(EC_LIB_SYSTEM_CALL, - "%s: %s: rtm_write() unexpectedly returned %d for command %s", - __func__, - prefix2str(p, prefix_buf, - sizeof(prefix_buf)), - error, lookup_msg(rtm_type_str, cmd, NULL)); + flog_err( + EC_LIB_SYSTEM_CALL, + "%s: %s: rtm_write() unexpectedly returned %d for command %s", + __func__, prefix_buf, error, + lookup_msg(rtm_type_str, cmd, NULL)); break; } } /* for (ALL_NEXTHOPS(...))*/ @@ -314,9 +313,9 @@ static int kernel_rtm(int cmd, const struct prefix *p, /* If there was no useful nexthop, then complain. */ if (nexthop_num == 0) { if (IS_ZEBRA_DEBUG_KERNEL) - zlog_debug("%s: No useful nexthops were found in RIB prefix %s", - __func__, prefix2str(p, prefix_buf, - sizeof(prefix_buf))); + zlog_debug( + "%s: No useful nexthops were found in RIB prefix %s", + __func__, prefix_buf); return 1; } |