proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-21 13:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Strip neighbors's description to 20 chars in show bgp summary

Browse Source 
Also make sure we do not show descriptions with whitespace characters, just
take the first splitted by whitespace.

```
root@exit1-debian-9:~/frr# vtysh -c 'show run' | grep description
 neighbor 192.168.0.2 description 12346789012345678901234567890
root@exit1-debian-9:~/frr# vtysh -c 'show ip bgp summary' | grep 192.168.0.2
192.168.0.2     4      65030         0         0        0    0    0    never Idle (Admin)        0 1234678901234567890
```

```
root@exit1-debian-9:~/frr# vtysh -c 'show run' | grep description
 neighbor 192.168.0.2 description one two
root@exit1-debian-9:~/frr# vtysh -c 'show ip bgp summary' | grep 192.168.0.2
192.168.0.2     4      65030         0         0        0    0    0    never Idle (Admin)        0 one
```

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2020-12-04 15:04:09 +02:00
parent 91653aefd4
commit cb75bb3173
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bgpd/bgp_vty.c
View File

@ -10499,6 +10499,25 @@ static void bgp_show_failed_summary(struct vty *vty, struct bgp *bgp,
}
}
/* If the peer's description includes whitespaces
* then return the first occurrence. Also strip description
* to the given size if needed.
*/
static char *bgp_peer_description_stripped(char *desc, uint32_t size)
{
static char stripped[BUFSIZ];
char *pnt;
uint32_t len = size > strlen(desc) ? strlen(desc) : size;
pnt = strchr(desc, ' ');
if (pnt)
len = size > (uint32_t)(pnt - desc) ? (uint32_t)(pnt - desc)
: size;
strlcpy(stripped, desc, len + 1);
return stripped;
}
/* Show BGP peer's summary information. */
static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
@ -11075,7 +11094,9 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
vty_out(vty, " %8u", 0);
}
if (peer->desc)
vty_out(vty, " %s", peer->desc);
vty_out(vty, " %s",
bgp_peer_description_stripped(
peer->desc, 20));
else
vty_out(vty, " N/A");
vty_out(vty, "\n");