Merge pull request #3370 from pguibert6WIND/default_vrf_initialization

[mirror_frr.git] / bgpd / bgp_updgrp.h

diff --git a/bgpd/bgp_updgrp.h b/bgpd/bgp_updgrp.h
index c1cbca6dcfe87e75516be146ab03441caa50cba3..6b3bf9d1f77f0fcbd6f3cbe7a9cd307afacad2ef 100644 (file)
--- a/bgpd/bgp_updgrp.h
+++ b/bgpd/bgp_updgrp.h
@@ -64,8 +64,7 @@
         | PEER_FLAG_REMOVE_PRIVATE_AS_ALL                                     \
         | PEER_FLAG_REMOVE_PRIVATE_AS_REPLACE                                 \
         | PEER_FLAG_REMOVE_PRIVATE_AS_ALL_REPLACE                             \
-        | PEER_FLAG_ADDPATH_TX_ALL_PATHS                                      \
-        | PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS | PEER_FLAG_AS_OVERRIDE)
+        | PEER_FLAG_AS_OVERRIDE)
 
 #define PEER_UPDGRP_CAP_FLAGS (PEER_CAP_AS4_RCV)
 
@@ -293,7 +292,7 @@ typedef int (*updgrp_walkcb)(struct update_group *updgrp, void *ctx);
 struct updwalk_context {
        struct vty *vty;
        struct bgp_node *rn;
-       struct bgp_info *ri;
+       struct bgp_path_info *pi;
        uint64_t updgrp_id;
        uint64_t subgrp_id;
        bgp_policy_type_e policy_type;
@@ -442,7 +441,7 @@ extern void subgroup_announce_all(struct update_subgroup *subgrp);
 extern void subgroup_default_originate(struct update_subgroup *subgrp,
                                       int withdraw);
 extern void group_announce_route(struct bgp *bgp, afi_t afi, safi_t safi,
-                                struct bgp_node *rn, struct bgp_info *ri);
+                                struct bgp_node *rn, struct bgp_path_info *pi);
 extern void subgroup_clear_table(struct update_subgroup *subgrp);
 extern void update_group_announce(struct bgp *bgp);
 extern void update_group_announce_rrclients(struct bgp *bgp);
@@ -455,7 +454,8 @@ extern void bgp_adj_out_remove_subgroup(struct bgp_node *rn,
                                        struct update_subgroup *subgrp);
 extern void bgp_adj_out_set_subgroup(struct bgp_node *rn,
                                     struct update_subgroup *subgrp,
-                                    struct attr *attr, struct bgp_info *binfo);
+                                    struct attr *attr,
+                                    struct bgp_path_info *path);
 extern void bgp_adj_out_unset_subgroup(struct bgp_node *rn,
                                       struct update_subgroup *subgrp,
                                       char withdraw, uint32_t addpath_tx_id);
@@ -468,8 +468,6 @@ extern int update_group_clear_update_dbg(struct update_group *updgrp,
 
 extern void update_bgp_group_free(struct bgp *bgp);
 extern int bgp_addpath_encode_tx(struct peer *peer, afi_t afi, safi_t safi);
-extern int bgp_addpath_tx_path(struct peer *peer, afi_t afi, safi_t safi,
-                              struct bgp_info *ri);
 
 /*
  * Inline functions