From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Mon, 24 Mar 2014 18:22:19 +0000 (+0100)
Subject: Fixes a bug in graceful restart.
X-Git-Tag: v1.4.1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e7c974d22ee5d938d8d8e7018f0a63f609d630b;p=thirdparty%2Fbird.git

Fixes a bug in graceful restart.
---

diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 2d4da8c9f..808afaa9c 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1201,7 +1201,7 @@ bgp_do_rx_update(struct bgp_conn *conn,
     return;
 
   /* Check for End-of-RIB marker */
-  if ((attr_len < 8) && !withdrawn_len && !attr_len &&
+  if ((attr_len < 8) && !withdrawn_len && !nlri_len && !p->mp_reach_len &&
       (p->mp_unreach_len == 3) && (get_u16(p->mp_unreach_start) == BGP_AF_IPV6))
     {
       bgp_rx_end_mark(p);