From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Tue, 2 Jan 2018 13:30:08 +0000 (+0100)
Subject: BGP: Fix graceful restart timer
X-Git-Tag: v2.0.1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e62cd033079c4bc988a467f4122c7c276c77fdde;p=thirdparty%2Fbird.git

BGP: Fix graceful restart timer

Should use remote value, not local value.
---

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 705c5e917..8da5b0aa4 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -689,8 +689,11 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
     c->packets_to_send = 0;
   }
 
+  /* p->gr_ready -> at least one active channel is c->gr_ready */
+  ASSERT(p->gr_active_num > 0);
+
   proto_notify_state(&p->p, PS_START);
-  bgp_start_timer(p->gr_timer, p->conn->local_caps->gr_time);
+  bgp_start_timer(p->gr_timer, p->conn->remote_caps->gr_time);
 }
 
 /**