When a route-reflector is configured with "next-hop self" towards an IBGP

peer, it will only set the nexthop to "self" for non-reflected routes.
To force the nexthop to "self" for reflected routes, a "next-hop self
force" configuration is required. With the introduction of the update
groups function, these two configurations are not distinguished correctly
leading to inconsistent behavior. Resolve by introducing the proper
distinction.

diff --git a/bgpd/bgp_updgrp.h b/bgpd/bgp_updgrp.h
index c34d2bc8efd9f30868d64824385618927c2e3576..b4e1078b00094e7583f34345ab3b98c47ad60ff8 100644 (file)
--- a/bgpd/bgp_updgrp.h
+++ b/bgpd/bgp_updgrp.h
@@ -41,6 +41,7 @@
                              PEER_FLAG_REFLECTOR_CLIENT |      \
                              PEER_FLAG_NEXTHOP_SELF |  \
                              PEER_FLAG_NEXTHOP_UNCHANGED |     \
+                             PEER_FLAG_FORCE_NEXTHOP_SELF |    \
                              PEER_FLAG_AS_PATH_UNCHANGED |     \
                              PEER_FLAG_MED_UNCHANGED |         \
                               PEER_FLAG_NEXTHOP_LOCAL_UNCHANGED | \