proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 16:54:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[bgpd] CID #4,#5,#9,#10, simplify aspath_print_vty usage

Browse Source 
2006-05-12 Paul Jakma <paul.jakma@sun.com>

	* bgp_aspath.{c,h}: (aspath_print_vty) take a format string,
	  so as to reduce burden on callers, all in bgp_route.c
	* bgp_route.c: (route_vty_out{,tmp}) Update to match
	  aspath_print_vty, simplifying checks needed to get spacing
	  right. CID #4,#5.
	  ({damp,flap}_route_vty_out) Ditto, CID #9, #10
This commit is contained in:
Paul Jakma 2006-05-12 23:48:40 +00:00
parent 06e110f937
commit b2518c1e88
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/ChangeLog
View File

@ -2,10 +2,15 @@
* bgp_attr.c: (bgp_packet_attribute) Remove dead code, Coverity * bgp_attr.c: (bgp_packet_attribute) Remove dead code, Coverity
CID #1 CID #1
* bgp_aspath.{c,h}: (aspath_print_vty) take a format string,
so as to reduce burden on callers, all in bgp_route.c
* bgp_route.c: (bgp_static_update_main) Remove useless NULL * bgp_route.c: (bgp_static_update_main) Remove useless NULL
check, code already assumes bgp_static can not be NULL, check, code already assumes bgp_static can not be NULL,
fixes CID #7. fixes CID #7.
(bgp_static_update_rsclient) ditto, CID #6 (bgp_static_update_rsclient) ditto, CID #6
(route_vty_out{,tmp}) Update to match aspath_print_vty,
simplifying checks needed to get spacing right. CID #4,#5.
({damp,flap}_route_vty_out) Ditto, CID #9, #10
2006-05-08 Paul Jakma <paul.jakma@sun.com> 2006-05-08 Paul Jakma <paul.jakma@sun.com>

5
bgpd/bgp_aspath.c
View File

@ -1501,9 +1501,10 @@ aspath_print (struct aspath *as)
/* Printing functions */ /* Printing functions */
void void
aspath_print_vty (struct vty *vty, struct aspath *as) aspath_print_vty (struct vty *vty, const char *format, struct aspath *as)
{ {
vty_out (vty, "%s", as->str); assert (format);
vty_out (vty, format, as->str);
} }
static void static void

2
bgpd/bgp_aspath.h
View File

@ -77,7 +77,7 @@ extern void aspath_free (struct aspath *);
extern struct aspath *aspath_intern (struct aspath *); extern struct aspath *aspath_intern (struct aspath *);
extern void aspath_unintern (struct aspath *); extern void aspath_unintern (struct aspath *);
extern const char *aspath_print (struct aspath *); extern const char *aspath_print (struct aspath *);
extern void aspath_print_vty (struct vty *, struct aspath *); extern void aspath_print_vty (struct vty *, const char *, struct aspath *);
extern void aspath_print_all_vty (struct vty *); extern void aspath_print_all_vty (struct vty *);
extern unsigned int aspath_key_make (struct aspath *); extern unsigned int aspath_key_make (struct aspath *);
extern int aspath_loop_check (struct aspath *, as_t); extern int aspath_loop_check (struct aspath *, as_t);

22
bgpd/bgp_route.c
View File

@ -5155,12 +5155,9 @@ route_vty_out (struct vty *vty, struct prefix *p,
/* Print aspath */ /* Print aspath */
if (attr->aspath) if (attr->aspath)
aspath_print_vty (vty, attr->aspath); aspath_print_vty (vty, "%s ", attr->aspath);
/* Print origin */ /* Print origin */
if (strlen (attr->aspath->str) == 0)
vty_out (vty, "%s", bgp_origin_str[attr->origin]);
else
vty_out (vty, "%s", bgp_origin_str[attr->origin]); vty_out (vty, "%s", bgp_origin_str[attr->origin]);
} }
vty_out (vty, "%s", VTY_NEWLINE); vty_out (vty, "%s", VTY_NEWLINE);
@ -5219,12 +5216,9 @@ route_vty_out_tmp (struct vty *vty, struct prefix *p,
/* Print aspath */ /* Print aspath */
if (attr->aspath) if (attr->aspath)
aspath_print_vty (vty, attr->aspath); aspath_print_vty (vty, "%s ", attr->aspath);
/* Print origin */ /* Print origin */
if (strlen (attr->aspath->str) == 0)
vty_out (vty, "%s", bgp_origin_str[attr->origin]);
else
vty_out (vty, "%s", bgp_origin_str[attr->origin]); vty_out (vty, "%s", bgp_origin_str[attr->origin]);
} }
@ -5314,12 +5308,9 @@ damp_route_vty_out (struct vty *vty, struct prefix *p,
{ {
/* Print aspath */ /* Print aspath */
if (attr->aspath) if (attr->aspath)
aspath_print_vty (vty, attr->aspath); aspath_print_vty (vty, "%s ", attr->aspath);
/* Print origin */ /* Print origin */
if (strlen (attr->aspath->str) == 0)
vty_out (vty, "%s", bgp_origin_str[attr->origin]);
else
vty_out (vty, "%s", bgp_origin_str[attr->origin]); vty_out (vty, "%s", bgp_origin_str[attr->origin]);
} }
vty_out (vty, "%s", VTY_NEWLINE); vty_out (vty, "%s", VTY_NEWLINE);
@ -5377,12 +5368,9 @@ flap_route_vty_out (struct vty *vty, struct prefix *p,
{ {
/* Print aspath */ /* Print aspath */
if (attr->aspath) if (attr->aspath)
aspath_print_vty (vty, attr->aspath); aspath_print_vty (vty, "%s ", attr->aspath);
/* Print origin */ /* Print origin */
if (strlen (attr->aspath->str) == 0)
vty_out (vty, "%s", bgp_origin_str[attr->origin]);
else
vty_out (vty, "%s", bgp_origin_str[attr->origin]); vty_out (vty, "%s", bgp_origin_str[attr->origin]);
} }
vty_out (vty, "%s", VTY_NEWLINE); vty_out (vty, "%s", VTY_NEWLINE);
@ -5408,7 +5396,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
if (aspath_count_hops (attr->aspath) == 0) if (aspath_count_hops (attr->aspath) == 0)
vty_out (vty, "Local"); vty_out (vty, "Local");
else else
aspath_print_vty (vty, attr->aspath); aspath_print_vty (vty, "%s", attr->aspath);
} }
if (CHECK_FLAG (binfo->flags, BGP_INFO_REMOVED)) if (CHECK_FLAG (binfo->flags, BGP_INFO_REMOVED))