summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Caputo <ccaputo@alt.net>2009-06-23 06:06:49 +0000
committerPaul Jakma <paul@quagga.net>2009-06-23 14:25:20 +0100
commit50aef6f3b0e36b56cfa9f3d374be0c1d25c30c45 (patch)
tree5dce97de6229713c6c209cbb72abc1093fa1be58
parent6e79f8bba438823d84b7464a9acc1e6fc9126a27 (diff)
Fix "show ip bgp dampened-paths" garbage output.
* bgpd/bgp_damp.c: Make bgp_damp_reuse_time_vty() accept a buffer and length, rather than returning a local var buffer whose contents can get trounced. Remove duplicate BGP_UPTIME_LEN define. * bgpd/bgp_damp.h: bgp_damp_reuse_time_vty() prototype change. * bgpd/bgp_route.c: Provide bgp_damp_reuse_time_vty() with a buffer and length. Remove duplicate BGP_UPTIME_LEN define. This problem was noticed in 2005... http://hibernia.jakma.org/~paul/patches/quagga-test.diff ...but the fix didn't make it into the code. Signed-off-by: Chris Caputo <ccaputo@alt.net>
-rw-r--r--bgpd/bgp_damp.c8
-rw-r--r--bgpd/bgp_damp.h3
-rw-r--r--bgpd/bgp_route.c7
3 files changed, 8 insertions, 10 deletions
diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index 346ba520..e21131ef 100644
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -541,8 +541,6 @@ bgp_config_write_damp (struct vty *vty)
VTY_NEWLINE);
}
-#define BGP_UPTIME_LEN 25
-
static const char *
bgp_get_reuse_time (unsigned int penalty, char *buf, size_t len)
{
@@ -616,11 +614,11 @@ 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)
+bgp_damp_reuse_time_vty (struct vty *vty, struct bgp_info *binfo,
+ char *timebuf, size_t len)
{
struct bgp_damp_info *bdi;
time_t t_now, t_diff;
- char timebuf[BGP_UPTIME_LEN];
int penalty;
if (!binfo->extra)
@@ -639,5 +637,5 @@ bgp_damp_reuse_time_vty (struct vty *vty, struct bgp_info *binfo)
t_diff = t_now - bdi->t_updated;
penalty = bgp_damp_decay (t_diff, bdi->penalty);
- return bgp_get_reuse_time (penalty, timebuf, BGP_UPTIME_LEN);
+ return bgp_get_reuse_time (penalty, timebuf, len);
}
diff --git a/bgpd/bgp_damp.h b/bgpd/bgp_damp.h
index e0bef4a8..e1d319b5 100644
--- a/bgpd/bgp_damp.h
+++ b/bgpd/bgp_damp.h
@@ -141,6 +141,7 @@ extern void bgp_damp_info_clean (void);
extern int bgp_damp_decay (time_t, int);
extern void bgp_config_write_damp (struct vty *);
extern void bgp_damp_info_vty (struct vty *, struct bgp_info *);
-extern const char * bgp_damp_reuse_time_vty (struct vty *, struct bgp_info *);
+extern const char * bgp_damp_reuse_time_vty (struct vty *, struct bgp_info *,
+ char *, size_t);
#endif /* _QUAGGA_BGP_DAMP_H */
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index a44d47ab..4f3f85b3 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -5810,6 +5810,7 @@ damp_route_vty_out (struct vty *vty, struct prefix *p,
{
struct attr *attr;
int len;
+ char timebuf[BGP_UPTIME_LEN];
/* short status lead text */
route_vty_short_status_out (vty, binfo);
@@ -5827,7 +5828,7 @@ damp_route_vty_out (struct vty *vty, struct prefix *p,
else
vty_out (vty, "%*s", len, " ");
- vty_out (vty, "%s ", bgp_damp_reuse_time_vty (vty, binfo));
+ vty_out (vty, "%s ", bgp_damp_reuse_time_vty (vty, binfo, timebuf, BGP_UPTIME_LEN));
/* Print attribute */
attr = binfo->attr;
@@ -5843,8 +5844,6 @@ damp_route_vty_out (struct vty *vty, struct prefix *p,
vty_out (vty, "%s", VTY_NEWLINE);
}
-#define BGP_UPTIME_LEN 25
-
/* flap route */
static void
flap_route_vty_out (struct vty *vty, struct prefix *p,
@@ -5888,7 +5887,7 @@ flap_route_vty_out (struct vty *vty, struct prefix *p,
if (CHECK_FLAG (binfo->flags, BGP_INFO_DAMPED)
&& ! CHECK_FLAG (binfo->flags, BGP_INFO_HISTORY))
- vty_out (vty, "%s ", bgp_damp_reuse_time_vty (vty, binfo));
+ vty_out (vty, "%s ", bgp_damp_reuse_time_vty (vty, binfo, timebuf, BGP_UPTIME_LEN));
else
vty_out (vty, "%*s ", 8, " ");