summaryrefslogtreecommitdiffstats
path: root/pimd/pim_iface.h
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-05-20 20:17:48 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-07-24 19:51:36 +0200
commitf88df3a6425f49fe12cb0808e248f9a4047e6176 (patch)
treeaaa6ab0213a7e6781fc1e43d669668daae6f7fd7 /pimd/pim_iface.h
parentpimd: Remove pimg from pim_iface.c (diff)
downloadfrr-f88df3a6425f49fe12cb0808e248f9a4047e6176.tar.xz
frr-f88df3a6425f49fe12cb0808e248f9a4047e6176.zip
pimd: Move pim_ifchannel_list and vif array into 'struct pim_instance *'
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_iface.h')
-rw-r--r--pimd/pim_iface.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index 16e62f6da..ef81152af 100644
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -140,7 +140,6 @@ struct pim_interface {
struct bfd_info *bfd_info;
};
-extern struct list *pim_ifchannel_list;
/*
if default_holdtime is set (>= 0), use it;
otherwise default_holdtime is 3.5 * hello_period
@@ -150,8 +149,8 @@ extern struct list *pim_ifchannel_list;
? ((pim_ifp)->pim_hello_period * 7 / 2) \
: ((pim_ifp)->pim_default_holdtime))
-void pim_if_init(void);
-void pim_if_terminate(void);
+void pim_if_init(struct pim_instance *pim);
+void pim_if_terminate(struct pim_instance *pim);
struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim);
void pim_if_delete(struct interface *ifp);
@@ -167,8 +166,8 @@ struct interface *pim_if_lookup_address_vrf(struct in_addr src,
int pim_if_add_vif(struct interface *ifp);
int pim_if_del_vif(struct interface *ifp);
-void pim_if_add_vif_all(void);
-void pim_if_del_vif_all(void);
+void pim_if_add_vif_all(struct pim_instance *pim);
+void pim_if_del_vif_all(struct pim_instance *pim);
struct interface *pim_if_find_by_vif_index(ifindex_t vif_index);
int pim_if_find_vifindex_by_ifindex(ifindex_t ifindex);