* bgp_route.c: Third (?) attempt to fix best selection breakage

	  introduced long time ago with route server patch. Hopefully
	  it's last case to fix - route-server client not in peer group.

	[backport candidate]

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index f7171665abcea8c8ceff4a504c7e3b7604c86290..29d0fb0ef2554c8ffd219e11381685f57937f76c 100644 (file)
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-26 Hasso Tepper <hasso at quagga.net>
+
+       * bgp_route.c: Third (?) attempt to fix best selection breakage
+         introduced long time ago with route server patch. Hopefully
+         it's last case to fix - route-server client not in peer group.
+
 2005-08-22 Hugo Santos <hsantos@av.it.pt>
 
        * bgp_vty.c: (general) Add support for BGP IPv6 Multicast SAFI

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 862fd4333e60e7270680fe9d5e68eedab1ba21a2..14fa86a5408565e49929a62d2e227bcae4631bb8 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1286,6 +1286,13 @@ bgp_process_rsclient (struct bgp_process_queue *pq)
     }
   else
     {
+      if (old_select)
+       UNSET_FLAG (old_select->flags, BGP_INFO_SELECTED);
+      if (new_select)
+       {
+         SET_FLAG (new_select->flags, BGP_INFO_SELECTED);
+         UNSET_FLAG (new_select->flags, BGP_INFO_ATTR_CHANGED);
+       }
       bgp_process_announce_selected (rsclient, new_select, rn,
                                     &attr, afi, safi);
     }