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

pim6d: Modify apis pim_process_rp_cmd for common processing

Browse Source 
Modify the apis pim_process_rp_cmd and pim_process_no_rp_cmd
to accomodate ipv4 as well as ipv6.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
This commit is contained in:
Mobashshera Rasool 2022-03-06 22:46:10 -08:00
parent 13ddf7cf74
commit a96942ca3e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pimd/pim_cmd_common.c
View File

@ -507,7 +507,7 @@ int pim_process_rp_cmd(struct vty *vty, const char *rp_str,
char rp_group_xpath[XPATH_MAXLEN]; char rp_group_xpath[XPATH_MAXLEN];
int result = 0; int result = 0;
struct prefix group; struct prefix group;
struct in_addr rp_addr; pim_addr rp_addr;
result = str2prefix(group_str, &group); result = str2prefix(group_str, &group);
if (result) { if (result) {
@ -527,7 +527,7 @@ int pim_process_rp_cmd(struct vty *vty, const char *rp_str,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
result = inet_pton(AF_INET, rp_str, &rp_addr); result = inet_pton(PIM_AF, rp_str, &rp_addr);
if (result <= 0) { if (result <= 0) {
vty_out(vty, "%% Bad RP address specified: %s\n", rp_str); vty_out(vty, "%% Bad RP address specified: %s\n", rp_str);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
@ -538,9 +538,8 @@ int pim_process_rp_cmd(struct vty *vty, const char *rp_str,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
snprintf(rp_group_xpath, sizeof(rp_group_xpath), snprintf(rp_group_xpath, sizeof(rp_group_xpath),
FRR_PIM_STATIC_RP_XPATH, FRR_PIM_STATIC_RP_XPATH, "frr-pim:pimd", "pim", vrfname,
"frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4", FRR_PIM_AF_XPATH_VAL, rp_str);
rp_str);
strlcat(rp_group_xpath, "/group-list", sizeof(rp_group_xpath)); strlcat(rp_group_xpath, "/group-list", sizeof(rp_group_xpath));
nb_cli_enqueue_change(vty, rp_group_xpath, NB_OP_CREATE, group_str); nb_cli_enqueue_change(vty, rp_group_xpath, NB_OP_CREATE, group_str);
@ -563,8 +562,7 @@ int pim_process_no_rp_cmd(struct vty *vty, const char *rp_str,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
snprintf(rp_xpath, sizeof(rp_xpath), FRR_PIM_STATIC_RP_XPATH, snprintf(rp_xpath, sizeof(rp_xpath), FRR_PIM_STATIC_RP_XPATH,
"frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4", "frr-pim:pimd", "pim", vrfname, FRR_PIM_AF_XPATH_VAL, rp_str);
rp_str);
printed = snprintf(group_list_xpath, sizeof(group_list_xpath), printed = snprintf(group_list_xpath, sizeof(group_list_xpath),
"%s/group-list", rp_xpath); "%s/group-list", rp_xpath);