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

lib: improve routemap error messages

Browse Source 
indicate which daemon was the source of the message and that it may be a
question of daemon support rather than a malformed argument

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-06-16 22:43:09 +00:00
parent 62e4232010
commit 98f224ef22
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/routemap.c
View File

@ -521,10 +521,12 @@ generic_match_add (struct vty *vty, struct route_map_index *index,
switch (ret) switch (ret)
{ {
case RMAP_RULE_MISSING: case RMAP_RULE_MISSING:
vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE); vty_out (vty, "%% [%s] Can't find rule.%s", frr_protonameinst,
VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
case RMAP_COMPILE_ERROR: case RMAP_COMPILE_ERROR:
vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE); vty_out (vty, "%% [%s] Argument form is unsupported or malformed.%s",
frr_protonameinst, VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }
} }
@ -567,10 +569,12 @@ generic_match_delete (struct vty *vty, struct route_map_index *index,
switch (ret) switch (ret)
{ {
case RMAP_RULE_MISSING: case RMAP_RULE_MISSING:
vty_out (vty, "%% BGP Can't find rule.%s", VTY_NEWLINE); vty_out (vty, "%% [%s] Can't find rule.%s", frr_protonameinst,
VTY_NEWLINE);
break; break;
case RMAP_COMPILE_ERROR: case RMAP_COMPILE_ERROR:
vty_out (vty, "%% BGP Argument is malformed.%s", VTY_NEWLINE); vty_out (vty, "%% [%s] Argument form is unsupported or malformed.%s",
frr_protonameinst, VTY_NEWLINE);
break; break;
} }
if (dep_name) if (dep_name)
@ -603,10 +607,12 @@ generic_set_add (struct vty *vty, struct route_map_index *index,
switch (ret) switch (ret)
{ {
case RMAP_RULE_MISSING: case RMAP_RULE_MISSING:
vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE); vty_out (vty, "%% [%s] Can't find rule.%s", frr_protonameinst,
VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
case RMAP_COMPILE_ERROR: case RMAP_COMPILE_ERROR:
vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE); vty_out (vty, "%% [%s] Argument form is unsupported or malformed.%s",
frr_protonameinst, VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }
} }
@ -625,10 +631,12 @@ generic_set_delete (struct vty *vty, struct route_map_index *index,
switch (ret) switch (ret)
{ {
case RMAP_RULE_MISSING: case RMAP_RULE_MISSING:
vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE); vty_out (vty, "%% [%s] Can't find rule.%s", frr_protonameinst,
VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
case RMAP_COMPILE_ERROR: case RMAP_COMPILE_ERROR:
vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE); vty_out (vty, "%% [%s] Argument form is unsupported or malformed.%s",
frr_protonameinst, VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }
} }