proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3760 from patrasar/RP_configure_inconsistent_addr_mask

Browse Source 
pimd: reject inconsistent address/mask "ip pim rp command"
This commit is contained in:
Donald Sharp 2019-02-08 07:37:43 -05:00 committed by GitHub
commit 97c6009d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pimd/pim_cmd.c
View File

@ -5142,6 +5142,12 @@ static int pim_rp_cmd_worker(struct pim_instance *pim, struct vty *vty,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
if (result == PIM_GROUP_BAD_ADDR_MASK_COMBO) {
vty_out(vty, "%% Inconsistent address and mask: %s\n",
group);
return CMD_WARNING_CONFIG_FAILED;
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }

12
pimd/pim_rp.c
View File

@ -345,6 +345,7 @@ int pim_rp_new(struct pim_instance *pim, const char *rp,
struct rp_info *tmp_rp_info; struct rp_info *tmp_rp_info;
char buffer[BUFSIZ]; char buffer[BUFSIZ];
struct prefix nht_p; struct prefix nht_p;
struct prefix temp;
struct pim_nexthop_cache pnc; struct pim_nexthop_cache pnc;
struct route_node *rn; struct route_node *rn;
@ -352,8 +353,17 @@ int pim_rp_new(struct pim_instance *pim, const char *rp,
if (group_range == NULL) if (group_range == NULL)
result = str2prefix("224.0.0.0/4", &rp_info->group); result = str2prefix("224.0.0.0/4", &rp_info->group);
else else {
result = str2prefix(group_range, &rp_info->group); result = str2prefix(group_range, &rp_info->group);
if (result) {
prefix_copy(&temp, &rp_info->group);
apply_mask(&temp);
if (!prefix_same(&rp_info->group, &temp)) {
XFREE(MTYPE_PIM_RP, rp_info);
return PIM_GROUP_BAD_ADDR_MASK_COMBO;
}
}
}
if (!result) { if (!result) {
XFREE(MTYPE_PIM_RP, rp_info); XFREE(MTYPE_PIM_RP, rp_info);

21
pimd/pimd.h
View File

@ -116,16 +116,17 @@
/* Remember 32 bits!!! */ /* Remember 32 bits!!! */
/* PIM error codes */ /* PIM error codes */
#define PIM_SUCCESS 0 #define PIM_SUCCESS 0
#define PIM_GROUP_BAD_ADDRESS -2 #define PIM_GROUP_BAD_ADDRESS -2
#define PIM_GROUP_OVERLAP -3 #define PIM_GROUP_OVERLAP -3
#define PIM_GROUP_PFXLIST_OVERLAP -4 #define PIM_GROUP_PFXLIST_OVERLAP -4
#define PIM_RP_BAD_ADDRESS -5 #define PIM_RP_BAD_ADDRESS -5
#define PIM_RP_NO_PATH -6 #define PIM_RP_NO_PATH -6
#define PIM_RP_NOT_FOUND -7 #define PIM_RP_NOT_FOUND -7
#define PIM_RP_PFXLIST_IN_USE -8 #define PIM_RP_PFXLIST_IN_USE -8
#define PIM_IFACE_NOT_FOUND -9 #define PIM_IFACE_NOT_FOUND -9
#define PIM_UPDATE_SOURCE_DUP -10 #define PIM_UPDATE_SOURCE_DUP -10
#define PIM_GROUP_BAD_ADDR_MASK_COMBO -11
const char *const PIM_ALL_SYSTEMS; const char *const PIM_ALL_SYSTEMS;
const char *const PIM_ALL_ROUTERS; const char *const PIM_ALL_ROUTERS;