bgpd: Fix continue/break change from old commit

[mirror_frr.git] / bgpd / bgp_updgrp.h

diff --git a/bgpd/bgp_updgrp.h b/bgpd/bgp_updgrp.h
index 7261933dc98b0c6c4b21c27fce804a22e701ee3d..0e10341bc433777fb418d70a55d0cec7b28ae98d 100644 (file)
--- a/bgpd/bgp_updgrp.h
+++ b/bgpd/bgp_updgrp.h
@@ -109,12 +109,6 @@ struct bpacket {
 struct bpacket_queue {
        TAILQ_HEAD(pkt_queue, bpacket) pkts;
 
-#if 0
-  /* A dummy packet that is used to thread all peers that have
-     completed their work */
-  struct bpacket sentinel;
-#endif
-
        unsigned int conf_max_count;
        unsigned int curr_count;
        unsigned int hwm_count;
@@ -210,6 +204,9 @@ struct update_subgroup {
        /* send prefix count */
        uint32_t scount;
 
+       /* send prefix count prior to packet update */
+       uint32_t pscount;
+
        /* announcement attribute hash */
        struct hash *hash;
 
@@ -254,6 +251,7 @@ struct update_subgroup {
        uint16_t sflags;
 #define SUBGRP_STATUS_DEFAULT_ORIGINATE (1 << 0)
 #define SUBGRP_STATUS_FORCE_UPDATES (1 << 1)
+#define SUBGRP_STATUS_TABLE_REPARSING (1 << 2)
 
        uint16_t flags;
 #define SUBGRP_FLAG_NEEDS_REFRESH (1 << 0)
@@ -377,7 +375,7 @@ extern void update_group_af_walk(struct bgp *bgp, afi_t afi, safi_t safi,
                                 updgrp_walkcb cb, void *ctx);
 extern void update_group_walk(struct bgp *bgp, updgrp_walkcb cb, void *ctx);
 extern void update_group_periodic_merge(struct bgp *bgp);
-extern int
+extern void
 update_group_refresh_default_originate_route_map(struct thread *thread);
 extern void update_group_start_advtimer(struct bgp *bgp);
 
@@ -463,7 +461,9 @@ extern int update_group_clear_update_dbg(struct update_group *updgrp,
                                         void *arg);
 
 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 bool bgp_addpath_encode_tx(struct peer *peer, afi_t afi, safi_t safi);
+extern bool bgp_check_selected(struct bgp_path_info *bpi, struct peer *peer,
+                              bool addpath_capable, afi_t afi, safi_t safi);
 
 /*
  * Inline functions