proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 17:13:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Add finer grain return codes for configuration

Browse Source 
When PIM handles some MSDP commands, a repeated command
was causing a CMD_WARNING_CONFIG_FAILED.  This should
be a CMD_WARNING.  Fix the code to allow vtysh to handle
this appropriately.

Ticket: CM-19053
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-01-03 09:06:44 -05:00
parent baa68bca40
commit 01841ed3a7
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pimd/pim_cmd.c
View File

@ -7485,6 +7485,7 @@ static int ip_msdp_peer_cmd_worker(struct pim_instance *pim, struct vty *vty,
enum pim_msdp_err result; enum pim_msdp_err result;
struct in_addr peer_addr; struct in_addr peer_addr;
struct in_addr local_addr; struct in_addr local_addr;
int ret = CMD_SUCCESS;
result = inet_pton(AF_INET, peer, &peer_addr); result = inet_pton(AF_INET, peer, &peer_addr);
if (result <= 0) { if (result <= 0) {
@ -7506,19 +7507,23 @@ static int ip_msdp_peer_cmd_worker(struct pim_instance *pim, struct vty *vty,
case PIM_MSDP_ERR_NONE: case PIM_MSDP_ERR_NONE:
break; break;
case PIM_MSDP_ERR_OOM: case PIM_MSDP_ERR_OOM:
ret = CMD_WARNING_CONFIG_FAILED;
vty_out(vty, "%% Out of memory\n"); vty_out(vty, "%% Out of memory\n");
break; break;
case PIM_MSDP_ERR_PEER_EXISTS: case PIM_MSDP_ERR_PEER_EXISTS:
ret = CMD_WARNING;
vty_out(vty, "%% Peer exists\n"); vty_out(vty, "%% Peer exists\n");
break; break;
case PIM_MSDP_ERR_MAX_MESH_GROUPS: case PIM_MSDP_ERR_MAX_MESH_GROUPS:
ret = CMD_WARNING_CONFIG_FAILED;
vty_out(vty, "%% Only one mesh-group allowed currently\n"); vty_out(vty, "%% Only one mesh-group allowed currently\n");
break; break;
default: default:
ret = CMD_WARNING_CONFIG_FAILED;
vty_out(vty, "%% peer add failed\n"); vty_out(vty, "%% peer add failed\n");
} }
return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS; return ret;
} }
DEFUN_HIDDEN (ip_msdp_peer, DEFUN_HIDDEN (ip_msdp_peer,
@ -7581,6 +7586,7 @@ static int ip_msdp_mesh_group_member_cmd_worker(struct pim_instance *pim,
{ {
enum pim_msdp_err result; enum pim_msdp_err result;
struct in_addr mbr_ip; struct in_addr mbr_ip;
int ret = CMD_SUCCESS;
result = inet_pton(AF_INET, mbr, &mbr_ip); result = inet_pton(AF_INET, mbr, &mbr_ip);
if (result <= 0) { if (result <= 0) {
@ -7594,19 +7600,23 @@ static int ip_msdp_mesh_group_member_cmd_worker(struct pim_instance *pim,
case PIM_MSDP_ERR_NONE: case PIM_MSDP_ERR_NONE:
break; break;
case PIM_MSDP_ERR_OOM: case PIM_MSDP_ERR_OOM:
ret = CMD_WARNING_CONFIG_FAILED;
vty_out(vty, "%% Out of memory\n"); vty_out(vty, "%% Out of memory\n");
break; break;
case PIM_MSDP_ERR_MG_MBR_EXISTS: case PIM_MSDP_ERR_MG_MBR_EXISTS:
ret = CMD_WARNING;
vty_out(vty, "%% mesh-group member exists\n"); vty_out(vty, "%% mesh-group member exists\n");
break; break;
case PIM_MSDP_ERR_MAX_MESH_GROUPS: case PIM_MSDP_ERR_MAX_MESH_GROUPS:
ret = CMD_WARNING_CONFIG_FAILED;
vty_out(vty, "%% Only one mesh-group allowed currently\n"); vty_out(vty, "%% Only one mesh-group allowed currently\n");
break; break;
default: default:
ret = CMD_WARNING_CONFIG_FAILED;
vty_out(vty, "%% member add failed\n"); vty_out(vty, "%% member add failed\n");
} }
return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS; return ret;
} }
DEFUN (ip_msdp_mesh_group_member, DEFUN (ip_msdp_mesh_group_member,