summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/user/bgp.rst8
-rw-r--r--zebra/zebra_fpm_dt.c2
-rw-r--r--zebra/zebra_fpm_protobuf.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst
index 38ed78eb86..de690adb34 100644
--- a/doc/user/bgp.rst
+++ b/doc/user/bgp.rst
@@ -1215,6 +1215,14 @@ Configuring Peers
keyword `all` is specified the modification is done also for routes learned
via iBGP.
+.. index:: neighbor PEER attribute-unchanged [{as-path|next-hop|med}]
+.. clicmd:: neighbor PEER attribute-unchanged [{as-path|next-hop|med}]
+
+ This command specifies attributes to be left unchanged for advertisements
+ sent to a peer. Use this to leave the next-hop unchanged in ipv6
+ configurations, as the route-map directive to leave the next-hop unchanged
+ is only available for ipv4.
+
.. index:: [no] neighbor PEER update-source <IFNAME|ADDRESS>
.. clicmd:: [no] neighbor PEER update-source <IFNAME|ADDRESS>
diff --git a/zebra/zebra_fpm_dt.c b/zebra/zebra_fpm_dt.c
index 389781d4f7..81437e72f5 100644
--- a/zebra/zebra_fpm_dt.c
+++ b/zebra/zebra_fpm_dt.c
@@ -90,7 +90,7 @@ static int zfpm_dt_find_route(rib_dest_t **dest_p, struct route_entry **re_p)
if (!re)
continue;
- if (nexthop_group_active_nexthop_num(re->nhe->nhg) == 0)
+ if (nexthop_group_active_nexthop_num(&(re->nhe->nhg)) == 0)
continue;
*dest_p = dest;
diff --git a/zebra/zebra_fpm_protobuf.c b/zebra/zebra_fpm_protobuf.c
index d50981debf..ade4b636d6 100644
--- a/zebra/zebra_fpm_protobuf.c
+++ b/zebra/zebra_fpm_protobuf.c
@@ -173,7 +173,7 @@ static Fpm__AddRoute *create_add_route_message(qpb_allocator_t *allocator,
* Figure out the set of nexthops to be added to the message.
*/
num_nhs = 0;
- for (ALL_NEXTHOPS_PTR(re->nhe->nhg, nexthop)) {
+ for (ALL_NEXTHOPS(re->nhe->nhg, nexthop)) {
if (num_nhs >= zrouter.multipath_num)
break;