summaryrefslogtreecommitdiffstats
path: root/pimd/pim_ssm.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-05-10 14:50:16 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-07-24 19:51:34 +0200
commite07fe9e6585f508d4af0ace192d267e7a383c32d (patch)
tree8a4592cf6e1ce3f640ad05bf749398ac6e0650d5 /pimd/pim_ssm.c
parentpimd: Modify pim_mroute_socket_[enable|disable] to be vrf aware (diff)
downloadfrr-e07fe9e6585f508d4af0ace192d267e7a383c32d.tar.xz
frr-e07fe9e6585f508d4af0ace192d267e7a383c32d.zip
pimd: Save pim instance on vrf pointer
This commit does these things: 1) Saves the pim instance created on the vrf pointer 2) Moves some initialization to the proper spot. 3) Remove vrf_id from 'struct pim_ssm' it is not needed 4) Removes some checks to prevent non-default vrf's from being created. 5) When creating the pim instance, save default vrf in pimg to allow backwards compatibility Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_ssm.c')
-rw-r--r--pimd/pim_ssm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/pimd/pim_ssm.c b/pimd/pim_ssm.c
index 604f00457..b11b498aa 100644
--- a/pimd/pim_ssm.c
+++ b/pimd/pim_ssm.c
@@ -130,12 +130,11 @@ int pim_ssm_range_set(vrf_id_t vrf_id, const char *plist_name)
return PIM_SSM_ERR_NONE;
}
-void *pim_ssm_init(vrf_id_t vrf_id)
+void *pim_ssm_init(void)
{
struct pim_ssm *ssm;
ssm = XCALLOC(MTYPE_PIM_SSM_INFO, sizeof(*ssm));
- ssm->vrf_id = vrf_id;
return ssm;
}