proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 04:54:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3346 from donaldsharp/pim_possible_issues

Browse Source 
Pim possible issues
This commit is contained in:
David Lamparter 2018-11-19 17:02:27 +01:00 committed by GitHub
commit add5f18350
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pimd/pim_ifchannel.c
View File

@ -1012,10 +1012,21 @@ int pim_ifchannel_local_membership_add(struct interface *ifp,
/* PIM enabled on interface? */ /* PIM enabled on interface? */
pim_ifp = ifp->info; pim_ifp = ifp->info;
if (!pim_ifp) if (!pim_ifp) {
if (PIM_DEBUG_EVENTS)
zlog_debug("%s:%s Expected pim interface setup for %s",
__PRETTY_FUNCTION__,
pim_str_sg_dump(sg), ifp->name);
return 0; return 0;
if (!PIM_IF_TEST_PIM(pim_ifp->options)) }
if (!PIM_IF_TEST_PIM(pim_ifp->options)) {
if (PIM_DEBUG_EVENTS)
zlog_debug("%s:%s PIM is not configured on this interface %s",
__PRETTY_FUNCTION__,
pim_str_sg_dump(sg), ifp->name);
return 0; return 0;
}
pim = pim_ifp->pim; pim = pim_ifp->pim;
@ -1033,6 +1044,10 @@ int pim_ifchannel_local_membership_add(struct interface *ifp,
ch = pim_ifchannel_add(ifp, sg, 0, PIM_UPSTREAM_FLAG_MASK_SRC_IGMP); ch = pim_ifchannel_add(ifp, sg, 0, PIM_UPSTREAM_FLAG_MASK_SRC_IGMP);
if (!ch) { if (!ch) {
if (PIM_DEBUG_EVENTS)
zlog_debug("%s:%s Unable to add ifchannel",
__PRETTY_FUNCTION__,
pim_str_sg_dump(sg));
return 0; return 0;
} }

8
pimd/pim_zebra.c
View File

@ -1048,6 +1048,10 @@ void igmp_source_forward_start(struct pim_instance *pim,
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
pim_str_sg_dump(&sg), pim_str_sg_dump(&sg),
group->group_igmp_sock->interface->name); group->group_igmp_sock->interface->name);
pim_channel_del_oif(source->source_channel_oil,
group->group_igmp_sock->interface,
PIM_OIF_FLAG_PROTO_IGMP);
return; return;
} }
/* /*
@ -1059,6 +1063,10 @@ void igmp_source_forward_start(struct pim_instance *pim,
if (PIM_DEBUG_MROUTE) if (PIM_DEBUG_MROUTE)
zlog_warn("%s: Failure to add local membership for %s", zlog_warn("%s: Failure to add local membership for %s",
__PRETTY_FUNCTION__, pim_str_sg_dump(&sg)); __PRETTY_FUNCTION__, pim_str_sg_dump(&sg));
pim_channel_del_oif(source->source_channel_oil,
group->group_igmp_sock->interface,
PIM_OIF_FLAG_PROTO_IGMP);
return; return;
} }