Merge pull request #9374 from mjstapp/fix_nhg_add_leak

[mirror_frr.git] / bgpd / bgp_damp.h

diff --git a/bgpd/bgp_damp.h b/bgpd/bgp_damp.h
index fc03b97c13bcf3dc5ad9d1446fbcc96aabbaeb2a..0c70abef84da5a5f9176af5adc7b28eee11e6c0b 100644 (file)
--- a/bgpd/bgp_damp.h
+++ b/bgpd/bgp_damp.h
@@ -25,6 +25,11 @@
 
 /* Structure maintained on a per-route basis. */
 struct bgp_damp_info {
+       /* Doubly linked list.  This information must be linked to
+          reuse_list or no_reuse_list.  */
+       struct bgp_damp_info *next;
+       struct bgp_damp_info *prev;
+
        /* Figure-of-merit.  */
        unsigned int penalty;
 
@@ -40,9 +45,6 @@ struct bgp_damp_info {
        /* Time of route start to be suppressed.  */
        time_t suppress_time;
 
-       /* Back reference to associated dampening configuration. */
-       struct bgp_damp_config *config;
-
        /* Back reference to bgp_path_info. */
        struct bgp_path_info *path;
 
@@ -51,8 +53,6 @@ struct bgp_damp_info {
 
        /* Current index in the reuse_list. */
        int index;
-#define BGP_DAMP_NO_REUSE_LIST_INDEX                                           \
-       (-1) /* index for elements on no_reuse_list */
 
        /* Last time message type. */
        uint8_t lastrecord;
@@ -61,12 +61,8 @@ struct bgp_damp_info {
 
        afi_t afi;
        safi_t safi;
-
-       SLIST_ENTRY(bgp_damp_info) entry;
 };
 
-SLIST_HEAD(reuselist, bgp_damp_info);
-
 /* Specified parameter set configuration. */
 struct bgp_damp_config {
        /* Value over which routes suppressed.  */
@@ -104,11 +100,11 @@ struct bgp_damp_config {
        int *reuse_index;
 
        /* Reuse list array per-set based. */
-       struct reuselist *reuse_list;
-       unsigned int reuse_offset;
+       struct bgp_damp_info **reuse_list;
+       int reuse_offset;
 
        /* All dampening information which is not on reuse list.  */
-       struct reuselist no_reuse_list;
+       struct bgp_damp_info *no_reuse_list;
 
        /* Reuse timer thread per-set base. */
        struct thread *t_reuse;
@@ -136,8 +132,6 @@ struct bgp_damp_config {
 #define REUSE_LIST_SIZE          256
 #define REUSE_ARRAY_SIZE        1024
 
-extern struct bgp_damp_config *get_active_bdc_from_pi(struct bgp_path_info *pi,
-                                                     afi_t afi, safi_t safi);
 extern int bgp_damp_enable(struct bgp *, afi_t, safi_t, time_t, unsigned int,
                           unsigned int, time_t);
 extern int bgp_damp_disable(struct bgp *, afi_t, safi_t);
@@ -145,16 +139,13 @@ extern int bgp_damp_withdraw(struct bgp_path_info *path, struct bgp_dest *dest,
                             afi_t afi, safi_t safi, int attr_change);
 extern int bgp_damp_update(struct bgp_path_info *path, struct bgp_dest *dest,
                           afi_t afi, safi_t saff);
-extern void bgp_damp_info_free(struct bgp_damp_info *bdi, int withdraw);
-extern void bgp_damp_info_clean(struct bgp *bgp, struct bgp_damp_config *bdc,
-                               afi_t afi, safi_t safi);
-extern void bgp_damp_config_clean(struct bgp_damp_config *bdc);
+extern void bgp_damp_info_free(struct bgp_damp_info *path, int withdraw,
+                              afi_t afi, safi_t safi);
+extern void bgp_damp_info_clean(afi_t afi, safi_t safi);
 extern int bgp_damp_decay(time_t, int, struct bgp_damp_config *damp);
-extern void bgp_config_write_damp(struct vty *vty, struct bgp *bgp, afi_t afi,
-                                 safi_t safi);
-extern void bgp_damp_info_vty(struct vty *vty, struct bgp *bgp,
-                             struct bgp_path_info *path, afi_t afi,
-                             safi_t safi, json_object *json_path);
+extern void bgp_config_write_damp(struct vty *, afi_t afi, safi_t safi);
+extern void bgp_damp_info_vty(struct vty *vty, struct bgp_path_info *path,
+                             afi_t afi, safi_t safi, json_object *json_path);
 extern const char *bgp_damp_reuse_time_vty(struct vty *vty,
                                           struct bgp_path_info *path,
                                           char *timebuf, size_t len, afi_t afi,
@@ -162,14 +153,5 @@ extern const char *bgp_damp_reuse_time_vty(struct vty *vty,
                                           json_object *json);
 extern int bgp_show_dampening_parameters(struct vty *vty, afi_t, safi_t,
                                         uint16_t);
-extern void bgp_peer_damp_enable(struct peer *peer, afi_t afi, safi_t safi,
-                                time_t half, unsigned int reuse,
-                                unsigned int suppress, time_t max);
-extern void bgp_peer_damp_disable(struct peer *peer, afi_t afi, safi_t safi);
-extern void bgp_config_write_peer_damp(struct vty *vty, struct peer *peer,
-                                      afi_t afi, safi_t safi);
-extern void bgp_show_peer_dampening_parameters(struct vty *vty,
-                                              struct peer *peer, afi_t afi,
-                                              safi_t safi, bool use_json);
 
 #endif /* _QUAGGA_BGP_DAMP_H */