From: sarita patra <saritap@vmware.com>
Date: Mon, 28 Feb 2022 23:57:47 +0000 (-0800)
Subject: pim6d: moving FRR_PIM_AF_XPATH_VAL into pim_nb.h
X-Git-Tag: pim6-testing-20220430~255^2~8
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d4addb4839d42fc3acce6cd6e1a0f9cc74c14ea7;p=matthieu%2Ffrr.git

pim6d: moving FRR_PIM_AF_XPATH_VAL into pim_nb.h

Signed-off-by: sarita patra <saritap@vmware.com>
---

diff --git a/pimd/pim_addr.h b/pimd/pim_addr.h
index a278a46593..e422a2e2da 100644
--- a/pimd/pim_addr.h
+++ b/pimd/pim_addr.h
@@ -33,7 +33,6 @@ typedef struct in_addr pim_addr;
 #define PIM_AFI		AFI_IP
 #define PIM_MAX_BITLEN	IPV4_MAX_BITLEN
 #define PIM_AF_NAME     "ip"
-#define	FRR_PIM_AF_XPATH_VAL "frr-routing:ipv4"
 
 union pimprefixptr {
 	prefixtype(pimprefixptr, struct prefix,      p)
@@ -53,7 +52,6 @@ typedef struct in6_addr pim_addr;
 #define PIM_AFI		AFI_IP6
 #define PIM_MAX_BITLEN	IPV6_MAX_BITLEN
 #define PIM_AF_NAME     "ipv6"
-#define	FRR_PIM_AF_XPATH_VAL "frr-routing:ipv6"
 
 union pimprefixptr {
 	prefixtype(pimprefixptr, struct prefix,      p)
diff --git a/pimd/pim_nb.h b/pimd/pim_nb.h
index 72c96d7d73..273c7e8a61 100644
--- a/pimd/pim_nb.h
+++ b/pimd/pim_nb.h
@@ -198,6 +198,12 @@ int lib_interface_gmp_address_family_static_group_destroy(
 int routing_control_plane_protocols_name_validate(
 	struct nb_cb_create_args *args);
 
+#if PIM_IPV == 4
+#define FRR_PIM_AF_XPATH_VAL "frr-routing:ipv4"
+#else
+#define FRR_PIM_AF_XPATH_VAL "frr-routing:ipv6"
+#endif
+
 #define FRR_PIM_VRF_XPATH                                               \
 	"/frr-routing:routing/control-plane-protocols/"                 \
 	"control-plane-protocol[type='%s'][name='%s'][vrf='%s']/"       \