From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Wed, 1 Aug 2018 15:35:39 +0000 (+0200)
Subject: BGP: Minor fixes in long-lived graceful restart
X-Git-Tag: v1.6.5~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4abccabd7b10808c2ebb9ad4f6cbac3fe47cfb8f;p=thirdparty%2Fbird.git

BGP: Minor fixes in long-lived graceful restart
---

diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 7703fb6e9..2ff61834f 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -129,7 +129,7 @@ struct bgp_conn {
   u8 peer_gr_aflags;
   u8 peer_llgr_aware;
   u8 peer_llgr_able;
-  u16 peer_llgr_time;
+  uint peer_llgr_time;
   u8 peer_llgr_aflags;
   u8 peer_ext_messages_support;		/* Peer supports extended message length [draft] */
   unsigned hold_time, keepalive_time;	/* Times calculated from my and neighbor's requirements */
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 0d1a3414b..a39670ef9 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -910,7 +910,7 @@ bgp_parse_capabilities(struct bgp_conn *conn, byte *opt, int len)
 	  conn->peer_llgr_able = 0;
 	  conn->peer_llgr_time = 0;
 	  conn->peer_llgr_aflags = 0;
-	  for (i = 0; i < cl; i += 4)
+	  for (i = 0; i < cl; i += 7)
 	    if (opt[2+i+0] == 0 && opt[2+i+1] == BGP_AF && opt[2+i+2] == 1) /* Match AFI/SAFI */
 	      {
 		conn->peer_llgr_able = 1;