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

Merge pull request #14406 from donaldsharp/pim_debug_fun

Browse Source 
pimd: Display oil_parent as a string name of the interface
This commit is contained in:
Donatas Abraitis 2023-09-18 11:40:48 +03:00 committed by GitHub
commit 41fa35a8f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pimd/pim_mroute.c
View File

@ -1276,10 +1276,15 @@ int pim_mroute_del(struct channel_oil *c_oil, const char *name)
if (!c_oil->installed) { if (!c_oil->installed) {
if (PIM_DEBUG_MROUTE) { if (PIM_DEBUG_MROUTE) {
char buf[1000]; char buf[1000];
zlog_debug( struct interface *iifp =
"%s %s: vifi %d for route is %s not installed, do not need to send del req. ", pim_if_find_by_vif_index(pim,
__FILE__, __func__, *oil_parent(c_oil), *oil_parent(c_oil));
pim_channel_oil_dump(c_oil, buf, sizeof(buf)));
zlog_debug("%s %s: incoming interface %s for route is %s not installed, do not need to send del req. ",
__FILE__, __func__,
iifp ? iifp->name : "Unknown",
pim_channel_oil_dump(c_oil, buf,
sizeof(buf)));
} }
return -2; return -2;
} }

13
pimd/pim_oil.c
View File

@ -286,12 +286,15 @@ int pim_channel_del_oif(struct channel_oil *channel_oil, struct interface *oif,
--channel_oil->oil_size; --channel_oil->oil_size;
if (PIM_DEBUG_MROUTE) { if (PIM_DEBUG_MROUTE) {
zlog_debug( struct interface *iifp =
"%s(%s): (S,G)=(%pPAs,%pPAs): proto_mask=%u IIF:%d OIF=%s vif_index=%d", pim_if_find_by_vif_index(pim_ifp->pim,
*oil_parent(channel_oil));
zlog_debug("%s(%s): (S,G)=(%pPAs,%pPAs): proto_mask=%u IIF:%s OIF=%s vif_index=%d",
__func__, caller, oil_origin(channel_oil), __func__, caller, oil_origin(channel_oil),
oil_mcastgrp(channel_oil), oil_mcastgrp(channel_oil), proto_mask,
proto_mask, iifp ? iifp->name : "Unknown", oif->name,
*oil_parent(channel_oil), oif->name,
pim_ifp->mroute_vif_index); pim_ifp->mroute_vif_index);
} }

6
pimd/pim_zlookup.c
View File

@ -502,9 +502,9 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
if (PIM_DEBUG_ZEBRA) { if (PIM_DEBUG_ZEBRA) {
more.src = *oil_origin(c_oil); more.src = *oil_origin(c_oil);
more.grp = *oil_mcastgrp(c_oil); more.grp = *oil_mcastgrp(c_oil);
zlog_debug( zlog_debug("Sending Request for New Channel Oil Information%pSG VIIF %d(%s:%s)",
"Sending Request for New Channel Oil Information%pSG VIIF %d(%s)", &more, *oil_parent(c_oil),
&more, *oil_parent(c_oil), c_oil->pim->vrf->name); ifp ? ifp->name : "Unknown", c_oil->pim->vrf->name);
} }
if (!ifp) if (!ifp)