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

lib: Convert vrf.c to use new error-code subsystem

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-08-20 10:39:44 -04:00 committed by Quentin Young
parent ff9d9d5ba1
commit 0351a28f2a
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/lib_errors.c
View File

@ -58,6 +58,12 @@ static struct log_ref ferr_lib_warn[] = {
.description = "The config subsystem attempted to read in it's configuration file which failed, so we are falling back to the backup config file to see if it is available", .description = "The config subsystem attempted to read in it's configuration file which failed, so we are falling back to the backup config file to see if it is available",
.suggestion = "Create configuration file", .suggestion = "Create configuration file",
}, },
{
.code = LIB_WARN_VRF_LENGTH,
.title = "The VRF subsystem has encountered a parsing error",
.description = "The VRF subsystem, during initialization, has found a parsing error with input it has received",
.suggestion = "Check the length of the vrf name and adjust accordingly",
},
{ {
.code = END_FERR, .code = END_FERR,
}, },

1
lib/lib_errors.h
View File

@ -44,6 +44,7 @@ enum lib_log_refs {
LIB_WARN_SLOW_THREAD, LIB_WARN_SLOW_THREAD,
LIB_WARN_RMAP_RECURSION_LIMIT, LIB_WARN_RMAP_RECURSION_LIMIT,
LIB_WARN_BACKUP_CONFIG, LIB_WARN_BACKUP_CONFIG,
LIB_WARN_VRF_LENGTH,
}; };
extern void lib_error_init(void); extern void lib_error_init(void);

15
lib/vrf.c
View File

@ -624,7 +624,8 @@ int vrf_handler_create(struct vty *vty, const char *vrfname,
"%% VRF name %s invalid: length exceeds %d bytes\n", "%% VRF name %s invalid: length exceeds %d bytes\n",
vrfname, VRF_NAMSIZ); vrfname, VRF_NAMSIZ);
else else
zlog_warn( flog_warn(
LIB_WARN_VRF_LENGTH,
"%% VRF name %s invalid: length exceeds %d bytes\n", "%% VRF name %s invalid: length exceeds %d bytes\n",
vrfname, VRF_NAMSIZ); vrfname, VRF_NAMSIZ);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
@ -653,7 +654,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
"VRF %u is already configured with VRF %s\n", "VRF %u is already configured with VRF %s\n",
vrf->vrf_id, vrf->name); vrf->vrf_id, vrf->name);
else else
zlog_warn("VRF %u is already configured with VRF %s\n", zlog_info("VRF %u is already configured with VRF %s\n",
vrf->vrf_id, vrf->name); vrf->vrf_id, vrf->name);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
@ -665,9 +666,9 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
"VRF %u already configured with NETNS %s\n", "VRF %u already configured with NETNS %s\n",
vrf->vrf_id, ns->name); vrf->vrf_id, ns->name);
else else
zlog_warn( zlog_info(
"VRF %u already configured with NETNS %s", "VRF %u already configured with NETNS %s",
vrf->vrf_id, ns->name); vrf->vrf_id, ns->name);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
} }
@ -683,7 +684,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
" with VRF %u(%s)\n", " with VRF %u(%s)\n",
ns->name, vrf2->vrf_id, vrf2->name); ns->name, vrf2->vrf_id, vrf2->name);
else else
zlog_warn("NS %s is already configured with VRF %u(%s)", zlog_info("NS %s is already configured with VRF %u(%s)",
ns->name, vrf2->vrf_id, vrf2->name); ns->name, vrf2->vrf_id, vrf2->name);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
@ -699,7 +700,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
vty_out(vty, "Can not associate NS %u with NETNS %s\n", vty_out(vty, "Can not associate NS %u with NETNS %s\n",
ns->ns_id, ns->name); ns->ns_id, ns->name);
else else
zlog_warn("Can not associate NS %u with NETNS %s", zlog_info("Can not associate NS %u with NETNS %s",
ns->ns_id, ns->name); ns->ns_id, ns->name);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }