From: Julien Courtat Date: Fri, 17 Jun 2016 13:31:09 +0000 (+0200) Subject: bgpd: support End-Of-Rib of VPNv4 address family X-Git-Tag: frr-3.0-branchpoint~108^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=440129913d3205eb4a081d6c1249f448521aa876;p=matthieu%2Ffrr.git bgpd: support End-Of-Rib of VPNv4 address family After graceful restart procedure, when BGP speaker has finished to send its VPNv4 routes to the restarting peer, it also sends End-Of-Rib message for afi=AFI_IPv4 safi=SAFI_MPLS_VPN. Signed-off-by: Julien Courtat --- diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 796a57f054..dffca37dd3 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -175,7 +175,7 @@ bgp_update_packet_eor (struct peer *peer, afi_t afi, safi_t safi) stream_putc (s, BGP_ATTR_MP_UNREACH_NLRI); stream_putc (s, 3); stream_putw (s, afi); - stream_putc (s, safi); + stream_putc (s, (safi == SAFI_MPLS_VPN) ? SAFI_MPLS_LABELED_VPN : safi); } bgp_packet_set_size (s); @@ -240,8 +240,7 @@ bgp_write_packet (struct peer *peer) if (!(PAF_SUBGRP(paf))->t_coalesce && peer->afc_nego[afi][safi] && peer->synctime && ! CHECK_FLAG (peer->af_sflags[afi][safi], - PEER_STATUS_EOR_SEND) - && safi != SAFI_MPLS_VPN) + PEER_STATUS_EOR_SEND)) { SET_FLAG (peer->af_sflags[afi][safi], PEER_STATUS_EOR_SEND);