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

Merge pull request #14104 from rampxxxx/bfd_audit

Browse Source 
bfdd: add additional parameters to json command
This commit is contained in:
Donald Sharp 2023-07-29 13:57:33 -04:00 committed by GitHub
commit 32bd81e365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfdd/bfd_packet.c
View File

@ -1742,9 +1742,10 @@ void bfd_peer_mac_set(int sd, struct bfd_session *bfd,
strlcpy(arpreq_.arp_dev, ifp->name, sizeof(arpreq_.arp_dev)); strlcpy(arpreq_.arp_dev, ifp->name, sizeof(arpreq_.arp_dev));
if (ioctl(sd, SIOCGARP, &arpreq_) < 0) { if (ioctl(sd, SIOCGARP, &arpreq_) < 0) {
zlog_warn( if (bglobal.debug_network)
"BFD: getting peer's mac on %s failed error %s", zlog_debug(
ifp->name, strerror(errno)); "BFD: getting peer's mac on %s failed error %s",
ifp->name, strerror(errno));
UNSET_FLAG(bfd->flags, BFD_SESS_FLAG_MAC_SET); UNSET_FLAG(bfd->flags, BFD_SESS_FLAG_MAC_SET);
memset(bfd->peer_hw_addr, 0, sizeof(bfd->peer_hw_addr)); memset(bfd->peer_hw_addr, 0, sizeof(bfd->peer_hw_addr));

6
bfdd/bfdd_vty.c
View File

@ -213,6 +213,8 @@ static struct json_object *__display_peer_json(struct bfd_session *bs)
uint32_t avg = 0; uint32_t avg = 0;
uint32_t max = 0; uint32_t max = 0;
if (bs->key.ifname[0])
json_object_string_add(jo, "interface", bs->key.ifname);
json_object_int_add(jo, "id", bs->discrs.my_discr); json_object_int_add(jo, "id", bs->discrs.my_discr);
json_object_int_add(jo, "remote-id", bs->discrs.remote_discr); json_object_int_add(jo, "remote-id", bs->discrs.remote_discr);
json_object_boolean_add(jo, "passive-mode", json_object_boolean_add(jo, "passive-mode",
@ -246,6 +248,10 @@ static struct json_object *__display_peer_json(struct bfd_session *bs)
json_object_string_add(jo, "diagnostic", diag2str(bs->local_diag)); json_object_string_add(jo, "diagnostic", diag2str(bs->local_diag));
json_object_string_add(jo, "remote-diagnostic", json_object_string_add(jo, "remote-diagnostic",
diag2str(bs->remote_diag)); diag2str(bs->remote_diag));
if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG))
json_object_string_add(jo, "type", "configured");
else
json_object_string_add(jo, "type", "dynamic");
json_object_int_add(jo, "receive-interval", json_object_int_add(jo, "receive-interval",
bs->timers.required_min_rx / 1000); bs->timers.required_min_rx / 1000);