matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: Convert pim_cmd.c to use correct pim instance

Browse source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-23 08:57:11 -04:00
parent b4575b3aa0
commit c68ba0d7bf
5 changed files with 500 additions and 279 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

766
pimd/pim_cmd.c
View file

File diff suppressed because it is too large Load diff

2
pimd/pim_rp.c
View file

@ -854,7 +854,7 @@ int pim_rp_check_is_my_ip_address(struct pim_instance *pim,
return 0;
}
void pim_rp_show_information(struct pim_instance *pim, struct vty *vty,
void pim_rp_show_information(struct vty *vty, struct pim_instance *pim,
u_char uj)
{
struct rp_info *rp_info;

2
pimd/pim_rp.h
View file

@ -67,7 +67,7 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, struct in_addr group);
#define I_am_RP(P, G) pim_rp_i_am_rp ((P), (G))
#define RP(P, G) pim_rp_g ((P), (G))
void pim_rp_show_information(struct pim_instance *pim, struct vty *vty,
void pim_rp_show_information(struct vty *vty, struct pim_instance *pim,
u_char uj);
void pim_resolve_rp_nh(struct pim_instance *pim);
int pim_rp_list_cmp(void *v1, void *v2);

7
pimd/pim_zebra.c
View file

@ -611,7 +611,7 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index)
}
}
void pim_scan_oil()
void pim_scan_oil(struct pim_instance *pim_matcher)
{
struct listnode *node;
struct listnode *nextnode;
@ -630,6 +630,9 @@ void pim_scan_oil()
if (!pim)
continue;
if (pim_matcher && pim != pim_matcher)
continue;
for (ALL_LIST_ELEMENTS(pim->channel_oil_list, node, nextnode,
c_oil)) {
if (c_oil->up
@ -655,7 +658,7 @@ static int on_rpf_cache_refresh(struct thread *t)
scan_upstream_rpf_cache();
/* update kernel multicast forwarding cache (MFC) */
pim_scan_oil();
pim_scan_oil(NULL);
qpim_rpf_cache_refresh_last = pim_time_monotonic_sec();
++qpim_rpf_cache_refresh_events;

2
pimd/pim_zebra.h
View file

@ -30,7 +30,7 @@ void pim_zebra_init(void);
void pim_zebra_zclient_update(struct vty *vty);
void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index);
void pim_scan_oil(void);
void pim_scan_oil(struct pim_instance *pim_matcher);
void igmp_anysource_forward_start(struct pim_instance *pim,
struct igmp_group *group);