From 13366862ccc976fa83978ea08879a7becef2bcb4 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 26 Mar 2019 09:11:28 -0400 Subject: [PATCH] bgpd: Split up warn message to allow finer grained understanding We have the same warn message in 3 spots, which makes it extremely hard to figure out which of the 3 has gone terribly wrong. Add a bit of code to disambiguate the 3 situations. Signed-off-by: Donald Sharp --- bgpd/bgp_attr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 226bf99d2c..bea46f3e45 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -1715,7 +1715,7 @@ int bgp_mp_reach_parse(struct bgp_attr_parser_args *args, stream_get(&attr->mp_nexthop_global, s, IPV6_MAX_BYTELEN); if (IN6_IS_ADDR_LINKLOCAL(&attr->mp_nexthop_global)) { if (!peer->nexthop.ifp) { - zlog_warn("%s: interface not set appropriately to handle some attributes", + zlog_warn("%s: Received a V6/VPNV6 Global attribute but address is a V6 LL and we have no peer interface information, withdrawing", peer->host); return BGP_ATTR_PARSE_WITHDRAW; } @@ -1732,7 +1732,7 @@ int bgp_mp_reach_parse(struct bgp_attr_parser_args *args, stream_get(&attr->mp_nexthop_global, s, IPV6_MAX_BYTELEN); if (IN6_IS_ADDR_LINKLOCAL(&attr->mp_nexthop_global)) { if (!peer->nexthop.ifp) { - zlog_warn("%s: interface not set appropriately to handle some attributes", + zlog_warn("%s: Received V6/VPNV6 Global and LL attribute but global address is a V6 LL and we have no peer interface information, withdrawing", peer->host); return BGP_ATTR_PARSE_WITHDRAW; } @@ -1762,7 +1762,7 @@ int bgp_mp_reach_parse(struct bgp_attr_parser_args *args, attr->mp_nexthop_len = IPV6_MAX_BYTELEN; } if (!peer->nexthop.ifp) { - zlog_warn("%s: Interface not set appropriately to handle this some attributes", + zlog_warn("%s: Received a V6 LL nexthop and we have no peer interface information, withdrawing", peer->host); return BGP_ATTR_PARSE_WITHDRAW; } -- 2.39.5