From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 24 Dec 2008 11:18:10 +0000 (+0100)
Subject: Fixes bug related to reconfiguration of BGP.
X-Git-Tag: v1.2.0~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=591211557f4106ed9e877fa9b80eb56ffb99fef3;p=thirdparty%2Fbird.git

Fixes bug related to reconfiguration of BGP.

BGP keeps its copy of configuration ptr and didn't update it during
reconfiguration. But old configuration is freed during reconfiguration.
That leads to unnecessary reset of BGP connection during reconfiguration
(old conf is corrupted and therefore different) and possibly other strange
behavior.
---

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 46b28906a..d1b7dee94 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -876,9 +876,15 @@ bgp_reconfigure(struct proto *P, struct proto_config *C)
   struct bgp_proto *p = (struct bgp_proto *) P;
   struct bgp_config *old = p->cf;
 
-  return !memcmp(((byte *) old) + sizeof(struct proto_config),
-		 ((byte *) new) + sizeof(struct proto_config),
-		 sizeof(struct bgp_config) - sizeof(struct proto_config));
+  int same = !memcmp(((byte *) old) + sizeof(struct proto_config),
+		     ((byte *) new) + sizeof(struct proto_config),
+		     sizeof(struct bgp_config) - sizeof(struct proto_config));
+
+  /* We should update our copy of configuration ptr as old configuration will be freed */
+  if (same)
+    p->cf = new;
+
+  return same;
 }
 
 struct protocol proto_bgp = {