From: Donatas Abraitis <donatas.abraitis@gmail.com>
Date: Sat, 14 Mar 2020 12:23:40 +0000 (+0200)
Subject: zebra: Distinguish source/destination PBR IP in zlog_warn messages
X-Git-Tag: base_7.4~242^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F6000%2Fhead;p=mirror%2Ffrr.git

zebra: Distinguish source/destination PBR IP in zlog_warn messages

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
---

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 88e3ce68d3..f1c181438e 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -2418,9 +2418,11 @@ static inline void zread_rule(ZAPI_HANDLER_ARGS)
 		}
 		if (!(zpr.rule.filter.dst_ip.family == AF_INET
 		      || zpr.rule.filter.dst_ip.family == AF_INET6)) {
-			zlog_warn("Unsupported PBR IP family: %s (%" PRIu8 ")",
-				  family2str(zpr.rule.filter.dst_ip.family),
-				  zpr.rule.filter.dst_ip.family);
+			zlog_warn(
+				"Unsupported PBR destination IP family: %s (%" PRIu8
+				")",
+				family2str(zpr.rule.filter.dst_ip.family),
+				zpr.rule.filter.dst_ip.family);
 			return;
 		}
 
@@ -2512,14 +2514,18 @@ static inline void zread_ipset_entry(ZAPI_HANDLER_ARGS)
 
 		if (!(zpi.dst.family == AF_INET
 		      || zpi.dst.family == AF_INET6)) {
-			zlog_warn("Unsupported PBR IP family: %s (%" PRIu8 ")",
-				  family2str(zpi.dst.family), zpi.dst.family);
+			zlog_warn(
+				"Unsupported PBR destination IP family: %s (%" PRIu8
+				")",
+				family2str(zpi.dst.family), zpi.dst.family);
 			goto stream_failure;
 		}
 		if (!(zpi.src.family == AF_INET
 		      || zpi.src.family == AF_INET6)) {
-			zlog_warn("Unsupported PBR IP family: %s (%" PRIu8 ")",
-				  family2str(zpi.src.family), zpi.src.family);
+			zlog_warn(
+				"Unsupported PBR source IP family: %s (%" PRIu8
+				")",
+				family2str(zpi.src.family), zpi.src.family);
 			goto stream_failure;
 		}