[bgpd] remove useless check and return in bgp_config_write_damp

2008-08-17 Stephen Hemminger <stephen.hemminger@vyatta.com>

	* bgp_damp.?: (bgp_config_write_damp) remove useless check
	  of statically allocated config storage, and useless return
	  value

Signed-off-by: Paul Jakma <paul@quagga.net>
This commit is contained in:
Stephen Hemminger 2008-08-17 17:51:47 +01:00 committed by Paul Jakma
parent ef9b113e2d
commit f3019aff24
2 changed files with 21 additions and 26 deletions

View File

@ -517,33 +517,28 @@ bgp_damp_disable (struct bgp *bgp, afi_t afi, safi_t safi)
return 0; return 0;
} }
int void
bgp_config_write_damp (struct vty *vty) bgp_config_write_damp (struct vty *vty)
{ {
if (&bgp_damp_cfg) if (bgp_damp_cfg.half_life == DEFAULT_HALF_LIFE*60
{ && bgp_damp_cfg.reuse_limit == DEFAULT_REUSE
if (bgp_damp_cfg.half_life == DEFAULT_HALF_LIFE*60 && bgp_damp_cfg.suppress_value == DEFAULT_SUPPRESS
&& bgp_damp_cfg.reuse_limit == DEFAULT_REUSE && bgp_damp_cfg.max_suppress_time == bgp_damp_cfg.half_life*4)
&& bgp_damp_cfg.suppress_value == DEFAULT_SUPPRESS vty_out (vty, " bgp dampening%s", VTY_NEWLINE);
&& bgp_damp_cfg.max_suppress_time == bgp_damp_cfg.half_life*4) else if (bgp_damp_cfg.half_life != DEFAULT_HALF_LIFE*60
vty_out (vty, " bgp dampening%s", VTY_NEWLINE); && bgp_damp_cfg.reuse_limit == DEFAULT_REUSE
else if (bgp_damp_cfg.half_life != DEFAULT_HALF_LIFE*60 && bgp_damp_cfg.suppress_value == DEFAULT_SUPPRESS
&& bgp_damp_cfg.reuse_limit == DEFAULT_REUSE && bgp_damp_cfg.max_suppress_time == bgp_damp_cfg.half_life*4)
&& bgp_damp_cfg.suppress_value == DEFAULT_SUPPRESS vty_out (vty, " bgp dampening %ld%s",
&& bgp_damp_cfg.max_suppress_time == bgp_damp_cfg.half_life*4) bgp_damp_cfg.half_life/60,
vty_out (vty, " bgp dampening %ld%s", VTY_NEWLINE);
bgp_damp_cfg.half_life/60, else
VTY_NEWLINE); vty_out (vty, " bgp dampening %ld %d %d %ld%s",
else bgp_damp_cfg.half_life/60,
vty_out (vty, " bgp dampening %ld %d %d %ld%s", bgp_damp_cfg.reuse_limit,
bgp_damp_cfg.half_life/60, bgp_damp_cfg.suppress_value,
bgp_damp_cfg.reuse_limit, bgp_damp_cfg.max_suppress_time/60,
bgp_damp_cfg.suppress_value, VTY_NEWLINE);
bgp_damp_cfg.max_suppress_time/60,
VTY_NEWLINE);
return 1;
}
return 0;
} }
#define BGP_UPTIME_LEN 25 #define BGP_UPTIME_LEN 25

View File

@ -140,7 +140,7 @@ extern void bgp_damp_info_free (struct bgp_damp_info *, int);
extern void bgp_damp_info_clean (void); extern void bgp_damp_info_clean (void);
extern char * bgp_get_reuse_time (unsigned int, char*, size_t); extern char * bgp_get_reuse_time (unsigned int, char*, size_t);
extern int bgp_damp_decay (time_t, int); extern int bgp_damp_decay (time_t, int);
extern int bgp_config_write_damp (struct vty *); extern void bgp_config_write_damp (struct vty *);
extern void bgp_damp_info_vty (struct vty *, struct bgp_info *); extern void bgp_damp_info_vty (struct vty *, struct bgp_info *);
extern char * bgp_damp_reuse_time_vty (struct vty *, struct bgp_info *); extern char * bgp_damp_reuse_time_vty (struct vty *, struct bgp_info *);