Merge pull request #2372 from gromit1811/pim-comment-fix

[mirror_frr.git] / bgpd / bgp_damp.c

diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index e2f97bf4fe80a6c9f492ef64bd68770d6fc84dbd..bce6056ded4adaae98f71431e86ebcffd618ccfb 100644 (file)
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -233,7 +233,7 @@ int bgp_damp_withdraw(struct bgp_info *binfo, struct bgp_node *rn, afi_t afi,
        /* Remove the route from a reuse list if it is on one.  */
        if (CHECK_FLAG(bdi->binfo->flags, BGP_INFO_DAMPED)) {
                /* If decay rate isn't equal to 0, reinsert brn. */
-               if (bdi->penalty != last_penalty) {
+               if (bdi->penalty != last_penalty && bdi->index >= 0) {
                        bgp_reuse_list_delete(bdi);
                        bgp_reuse_list_add(bdi);
                }
@@ -523,7 +523,7 @@ void bgp_config_write_damp(struct vty *vty)
 }
 
 static const char *bgp_get_reuse_time(unsigned int penalty, char *buf,
-                                     size_t len, u_char use_json,
+                                     size_t len, uint8_t use_json,
                                      json_object *json)
 {
        time_t reuse_time = 0;
@@ -641,7 +641,7 @@ void bgp_damp_info_vty(struct vty *vty, struct bgp_info *binfo,
 }
 
 const char *bgp_damp_reuse_time_vty(struct vty *vty, struct bgp_info *binfo,
-                                   char *timebuf, size_t len, u_char use_json,
+                                   char *timebuf, size_t len, uint8_t use_json,
                                    json_object *json)
 {
        struct bgp_damp_info *bdi;