From 6dc54cfd9a9daa964099d8aaf40b87f49bf29e72 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 29 Jul 2025 14:15:08 +0200
Subject: [PATCH] BGP: Do not restart when next hop keep/self is changed

The change in dade7147eb6b62b2d58d478a370baef513d96975 forces BGP to restart
even if next hop self and next hop keep changes, which can be updated just by
reloading export, while explicit next hop address can not.

Related to #280.
---
 doc/bird.sgml   | 2 +-
 proto/bgp/bgp.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index d981936af..98a480f79 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -3958,7 +3958,6 @@ direction (re-export of routes to the BGP neighbor):
 
 <itemize>
 	<item><cf/export/
-	<item><cf/next hop address/
 	<item><cf/next hop self/
 	<item><cf/next hop keep/
 	<item><cf/link local next hop format/
@@ -3995,6 +3994,7 @@ direction (re-export of routes to the BGP neighbor):
 	<item><cf/graceful restart/
 	<item><cf/long lived graceful restart/
 	<item><cf/long lived stale time/
+	<item><cf/next hop address/
 	<item><cf/extended next hop/
 	<item><cf/add paths/
 	<item><cf/import table/
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 5998a8482..ad51e6260 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -2858,12 +2858,12 @@ bgp_channel_reconfigure(struct channel *C, struct channel_config *CC, int *impor
   }
 
   /* Outgoing next hop setting is too complex to update, forcing restart. */
-  if (!ipa_equal(new->next_hop_addr, old->next_hop_addr) ||
-      (new->next_hop_self != old->next_hop_self) ||
-      (new->next_hop_keep != old->next_hop_keep))
+  if (!ipa_equal(new->next_hop_addr, old->next_hop_addr))
     return 0;
 
-  if ((new->llnh_format != old->llnh_format) ||
+  if ((new->next_hop_self != old->next_hop_self) ||
+      (new->next_hop_keep != old->next_hop_keep) ||
+      (new->llnh_format != old->llnh_format) ||
       (new->aigp != old->aigp) ||
       (new->aigp_originate != old->aigp_originate))
     *export_changed = 1;
-- 
2.47.2