pimd: Create macro to get appropriate pim instance

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 059bd4e6f4af3e752b83db57fbef672c480d6ba9..5a0737fcfea7caf9df89db14bc7de602f00133a0 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -4524,8 +4524,7 @@ DEFUN (ip_pim_rp,
        "ip address of RP\n"
        "Group Address range to cover\n")
 {
-       VTY_DECLVAR_CONTEXT(vrf, vrf);
-       struct pim_instance *pim = vrf->info;
+       PIM_DECLVAR_CONTEXT(vrf, pim);
        int idx_ipv4 = 3;
 
        if (argc == (idx_ipv4 + 1))

diff --git a/pimd/pim_cmd.h b/pimd/pim_cmd.h
index 64751d8682b12fc6da3752dcad735645acaab43e..8867514876a8283a6d3622a8a40192d473e7a563 100644 (file)
--- a/pimd/pim_cmd.h
+++ b/pimd/pim_cmd.h
@@ -66,4 +66,13 @@
 
 void pim_cmd_init(void);
 
+/*
+ * Special Macro to allow us to get the correct pim_instance;
+ */
+#define PIM_DECLVAR_CONTEXT(A, B)                                              \
+       struct vrf *A = VTY_GET_CONTEXT(vrf);                                  \
+       struct pim_instance *B =                                               \
+               (vrf) ? vrf->info : pim_get_pim_instance(VRF_DEFAULT);         \
+       vrf = (vrf) ? vrf : pim->vrf;
+
 #endif /* PIM_CMD_H */