From a83da8e19cdc0d74f0589f8644dbe5b79943498c Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Wed, 14 Mar 2018 10:33:40 +0100 Subject: [PATCH] bgpd: mp_unreach_nlri fs sent with no nexthop FS UNREACH message with 0 NLRI inside is sent after each peer establishment. FS can send NLRI messages with no nexthop. The commit fixes a message that is triggered by mistake if FS was about to be sent, then that message is not output. Also it fixes a typo. Signed-off-by: Philippe Guibert --- bgpd/bgp_attr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 639365588c..ef839dba6a 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -2736,9 +2736,10 @@ size_t bgp_packet_mpattr_start(struct stream *s, struct peer *peer, afi_t afi, } break; default: - zlog_err( - "Bad nexthop when sening to %s, AFI %u SAFI %u nhlen %d", - peer->host, afi, safi, attr->mp_nexthop_len); + if (safi != SAFI_FLOWSPEC) + zlog_err( + "Bad nexthop when sending to %s, AFI %u SAFI %u nhlen %d", + peer->host, afi, safi, attr->mp_nexthop_len); break; }