proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-14 04:07:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pim6d: moving FRR_PIM_AF_XPATH_VAL into pim_nb.h

Browse Source 
Signed-off-by: sarita patra <saritap@vmware.com>
This commit is contained in:
sarita patra 2022-02-28 15:57:47 -08:00
parent 5ff968abbe
commit d4addb4839
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pimd/pim_addr.h
View File

@ -33,7 +33,6 @@ typedef struct in_addr pim_addr;
#define PIM_AFI AFI_IP #define PIM_AFI AFI_IP
#define PIM_MAX_BITLEN IPV4_MAX_BITLEN #define PIM_MAX_BITLEN IPV4_MAX_BITLEN
#define PIM_AF_NAME "ip" #define PIM_AF_NAME "ip"
#define FRR_PIM_AF_XPATH_VAL "frr-routing:ipv4"
union pimprefixptr { union pimprefixptr {
prefixtype(pimprefixptr, struct prefix, p) prefixtype(pimprefixptr, struct prefix, p)
@ -53,7 +52,6 @@ typedef struct in6_addr pim_addr;
#define PIM_AFI AFI_IP6 #define PIM_AFI AFI_IP6
#define PIM_MAX_BITLEN IPV6_MAX_BITLEN #define PIM_MAX_BITLEN IPV6_MAX_BITLEN
#define PIM_AF_NAME "ipv6" #define PIM_AF_NAME "ipv6"
#define FRR_PIM_AF_XPATH_VAL "frr-routing:ipv6"
union pimprefixptr { union pimprefixptr {
prefixtype(pimprefixptr, struct prefix, p) prefixtype(pimprefixptr, struct prefix, p)

6
pimd/pim_nb.h
View File

@ -198,6 +198,12 @@ int lib_interface_gmp_address_family_static_group_destroy(
int routing_control_plane_protocols_name_validate( int routing_control_plane_protocols_name_validate(
struct nb_cb_create_args *args); 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 \ #define FRR_PIM_VRF_XPATH \
"/frr-routing:routing/control-plane-protocols/" \ "/frr-routing:routing/control-plane-protocols/" \
"control-plane-protocol[type='%s'][name='%s'][vrf='%s']/" \ "control-plane-protocol[type='%s'][name='%s'][vrf='%s']/" \