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

Merge pull request #15545 from donaldsharp/bgp_attr_dump

Browse Source 
bgpd: Add some missing data to `show bgp attribute-info`
This commit is contained in:
Donatas Abraitis 2024-03-15 09:43:45 +02:00 committed by GitHub
commit 387a035b66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_aspath.c
View File

@ -2249,7 +2249,7 @@ void aspath_finish(void)
/* return and as path value */ /* return and as path value */
const char *aspath_print(struct aspath *as) const char *aspath_print(struct aspath *as)
{ {
return (as ? as->str : NULL); return as ? as->str : "(null)";
} }
/* Printing functions */ /* Printing functions */

11
bgpd/bgp_attr.c
View File

@ -911,9 +911,16 @@ static void attr_show_all_iterator(struct hash_bucket *bucket, struct vty *vty)
vty_out(vty, vty_out(vty,
"\tflags: %" PRIu64 "\tflags: %" PRIu64
" distance: %u med: %u local_pref: %u origin: %u weight: %u label: %u sid: %pI6\n", " distance: %u med: %u local_pref: %u origin: %u weight: %u label: %u sid: %pI6 aigp_metric: %" PRIu64
"\n",
attr->flag, attr->distance, attr->med, attr->local_pref, attr->flag, attr->distance, attr->med, attr->local_pref,
attr->origin, attr->weight, attr->label, sid); attr->origin, attr->weight, attr->label, sid, attr->aigp_metric);
vty_out(vty,
"\taspath: %s Community: %s Extended Community: %s Large Community: %s\n",
aspath_print(attr->aspath),
community_str(attr->community, false, false),
ecommunity_str(attr->ecommunity),
lcommunity_str(attr->lcommunity, false, false));
} }
void attr_show_all(struct vty *vty) void attr_show_all(struct vty *vty)

5
bgpd/bgp_ecommunity.c
View File

@ -263,8 +263,11 @@ struct ecommunity *ecommunity_dup(struct ecommunity *ecom)
} }
/* Return string representation of ecommunities attribute. */ /* Return string representation of ecommunities attribute. */
char *ecommunity_str(struct ecommunity *ecom) const char *ecommunity_str(struct ecommunity *ecom)
{ {
if (!ecom)
return "(null)";
if (!ecom->str) if (!ecom->str)
ecom->str = ecom->str =
ecommunity_ecom2str(ecom, ECOMMUNITY_FORMAT_DISPLAY, 0); ecommunity_ecom2str(ecom, ECOMMUNITY_FORMAT_DISPLAY, 0);

2
bgpd/bgp_ecommunity.h
View File

@ -346,7 +346,7 @@ extern void ecommunity_strfree(char **s);
extern bool ecommunity_include(struct ecommunity *e1, struct ecommunity *e2); extern bool ecommunity_include(struct ecommunity *e1, struct ecommunity *e2);
extern bool ecommunity_match(const struct ecommunity *, extern bool ecommunity_match(const struct ecommunity *,
const struct ecommunity *); const struct ecommunity *);
extern char *ecommunity_str(struct ecommunity *ecom); extern const char *ecommunity_str(struct ecommunity *ecom);
extern struct ecommunity_val *ecommunity_lookup(const struct ecommunity *, extern struct ecommunity_val *ecommunity_lookup(const struct ecommunity *,
uint8_t, uint8_t); uint8_t, uint8_t);

2
bgpd/bgp_updgrp.c
View File

@ -443,7 +443,7 @@ static unsigned int updgrp_hash_key_make(const void *p)
key = jhash_1word((peer->flags & PEER_FLAG_AIGP), key); key = jhash_1word((peer->flags & PEER_FLAG_AIGP), key);
if (peer->soo[afi][safi]) { if (peer->soo[afi][safi]) {
char *soo_str = ecommunity_str(peer->soo[afi][safi]); const char *soo_str = ecommunity_str(peer->soo[afi][safi]);
key = jhash_1word(jhash(soo_str, strlen(soo_str), SEED1), key); key = jhash_1word(jhash(soo_str, strlen(soo_str), SEED1), key);
} }