diff options
author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-06-20 21:00:43 +0200 |
---|---|---|
committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-14 22:02:05 +0200 |
commit | 164ffab25150556325b62666a082d1fe76dfa45e (patch) | |
tree | 7ffb2db4f91feb58595eeb07dc2f0818b6e48066 | |
parent | lib: add 'show error all json' (diff) | |
download | frr-164ffab25150556325b62666a082d1fe76dfa45e.tar.xz frr-164ffab25150556325b62666a082d1fe76dfa45e.zip |
*: remove \n from error code texts
Should be handled by pager
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
-rw-r--r-- | babeld/babel_errors.c | 2 | ||||
-rw-r--r-- | bgpd/bgp_errors.c | 40 | ||||
-rw-r--r-- | lib/lib_errors.c | 24 |
3 files changed, 33 insertions, 33 deletions
diff --git a/babeld/babel_errors.c b/babeld/babel_errors.c index ec0ff5192..cb9a6052d 100644 --- a/babeld/babel_errors.c +++ b/babeld/babel_errors.c @@ -29,7 +29,7 @@ static struct ferr_ref ferr_babel_err[] = { .code = BABEL_ERR_MEMORY, .title = "BABEL Memory Errors", .description = "Babel has failed to allocate memory, the system is about to run out of memory", - .suggestion = "Find the process that is causing memory shortages and remediate that process\nRestart FRR" + .suggestion = "Find the process that is causing memory shortages and remediate that process Restart FRR" }, { .code = BABEL_ERR_PACKET, diff --git a/bgpd/bgp_errors.c b/bgpd/bgp_errors.c index c86178d99..4627a8826 100644 --- a/bgpd/bgp_errors.c +++ b/bgpd/bgp_errors.c @@ -29,43 +29,43 @@ static struct ferr_ref ferr_bgp_err[] = { .code = BGP_ERR_ATTR_FLAG, .title = "BGP attribute flag is incorrect", .description = "BGP attribute flag is set to the wrong value (Optional/Transitive/Partial)", - .suggestion = "Determine the soure of the attribute and determine why the attribute\n flag has been set incorrectly" + .suggestion = "Determine the soure of the attribute and determine why the attribute flag has been set incorrectly" }, { .code = BGP_ERR_ATTR_LEN, .title = "BGP attribute length is incorrect", - .description = "BGP attribute length is incorrect)", - .suggestion = "Determine the soure of the attribute and determine why the attribute\nlength has been set incorrectly" + .description = "BGP attribute length is incorrect", + .suggestion = "Determine the soure of the attribute and determine why the attribute length has been set incorrectly" }, { .code = BGP_ERR_ATTR_ORIGIN, .title = "BGP attribute origin value invalid", .description = "BGP attribute origin value is invalid", - .suggestion = "Determine the soure of the attribute and determine why the origin\nattribute has been set incorrectly" + .suggestion = "Determine the soure of the attribute and determine why the origin attribute has been set incorrectly" }, { .code = BGP_ERR_ATTR_MAL_AS_PATH, .title = "BGP as path is invalid", .description = "BGP as path has been malformed", - .suggestion = "Determine the soure of the update and determine why the as path has\nbeen set incorrectly" + .suggestion = "Determine the soure of the update and determine why the as path has been set incorrectly" }, { .code = BGP_ERR_ATTR_FIRST_AS, .title = "BGP as path first as is invalid", .description = "BGP update has invalid first as in as path", - .suggestion = "Determine the soure of the update and determine why the as path first\nas value has been set incorrectly" + .suggestion = "Determine the soure of the update and determine why the as path first as value has been set incorrectly" }, { .code = BGP_ERR_ATTR_PMSI_TYPE, .title = "BGP PMSI tunnel attribute type is invalid", .description = "BGP update has invalid type for PMSI tunnel", - .suggestion = "Determine the soure of the update and determine why the PMSI tunnel\nattribute type has been set incorrectly" + .suggestion = "Determine the soure of the update and determine why the PMSI tunnel attribute type has been set incorrectly" }, { .code = BGP_ERR_ATTR_PMSI_LEN, .title = "BGP PMSI tunnel attribute length is invalid", .description = "BGP update has invalid length for PMSI tunnel", - .suggestion = "Determine the soure of the update and determine why the PMSI tunnel\nattribute length has been set incorrectly" + .suggestion = "Determine the soure of the update and determine why the PMSI tunnel attribute length has been set incorrectly" }, { .code = BGP_ERR_PEER_GROUP, @@ -77,13 +77,13 @@ static struct ferr_ref ferr_bgp_err[] = { .code = BGP_ERR_PEER_DELETE, .title = "BGP failed to delete peer structure", .description = "BGP was unable to delete peer structure when address-family removed", - .suggestion = "Determine if all expected peers are removed and restart FRR if not.\nMost likely a bug" + .suggestion = "Determine if all expected peers are removed and restart FRR if not. Most likely a bug" }, { .code = BGP_ERR_TABLE_CHUNK, .title = "BGP failed to get table chunk memory", .description = "BGP unable to get chunk memory for table manager", - .suggestion = "Ensure there is adequate memory on the device to support the table\nrequirements" + .suggestion = "Ensure there is adequate memory on the device to support the table requirements" }, { .code = BGP_ERR_MACIP_LEN, @@ -95,12 +95,12 @@ static struct ferr_ref ferr_bgp_err[] = { .code = BGP_ERR_LM_ERROR, .title = "BGP received invalid label manager message", .description = "BGP received nvalid label manager message from label manager", - .suggestion = "Label manager sent invalid essage to BGP for wrong protocol, instance, etc.\nMost likely a bug" + .suggestion = "Label manager sent invalid essage to BGP for wrong protocol, instance, etc. Most likely a bug" }, { .code = BGP_ERR_JSON_MEM_ERROR, .title = "BGP unable to allocate memory for JSON output", - .description = "BGP attempted to generate JSON output and was unable to allocate\nthe memory required", + .description = "BGP attempted to generate JSON output and was unable to allocate the memory required", .suggestion = "Ensure that the device has adequate memory to suport the required functions" }, { @@ -131,7 +131,7 @@ static struct ferr_ref ferr_bgp_err[] = { .code = BGP_ERR_SND_FAIL, .title = "BGP error sending to peer", .description = "BGP attempted to respond to open from a peer and failed", - .suggestion = "BGP attempted to respond to an open and could not sene the packet.\nCheck local IP address for source" + .suggestion = "BGP attempted to respond to an open and could not sene the packet. Check local IP address for source" }, { .code = BGP_ERR_INVALID_STATUS, @@ -155,30 +155,30 @@ static struct ferr_ref ferr_bgp_err[] = { .code = BGP_ERR_NOTIFY_RCV, .title = "BGP error receiving notify message", .description = "BGP unable to process notification message", - .suggestion = "BGP notify received while in stopped state. If the problem persists,\nreport for troubleshooting" + .suggestion = "BGP notify received while in stopped state. If the problem persists, report for troubleshooting" }, { .code = BGP_ERR_KEEP_RCV, .title = "BGP error receiving keepalive packet", .description = "BGP unable to process keepalive packet", - .suggestion = "BGP keepalive received while in stopped state. If the problem persists,\nreport for troubleshooting" + .suggestion = "BGP keepalive received while in stopped state. If the problem persists, report for troubleshooting" }, { .code = BGP_ERR_RFSH_RCV, .title = "BGP error receiving route refresh message", .description = "BGP unable to process route refresh message", - .suggestion = "BGP route refresh received while in stopped state. If the problem persists,\nreport for troubleshooting"}, + .suggestion = "BGP route refresh received while in stopped state. If the problem persists, report for troubleshooting"}, { .code = BGP_ERR_CAP_RCV, .title = "BGP error capability message", .description = "BGP unable to process received capability", - .suggestion = "BGP capability message received while in stopped state. If the problem\npersists, report for troubleshooting" + .suggestion = "BGP capability message received while in stopped state. If the problem persists, report for troubleshooting" }, { .code = BGP_ERR_NH_UPD, .title = "BGP error with nexthopo update", .description = "BGP unable to process nexthop update", - .suggestion = "BGP received nexthop update but nexthop is not reachable in this bgp\ninstance. Report for troubleshooting" + .suggestion = "BGP received nexthop update but nexthop is not reachable in this bgp instance. Report for troubleshooting" }, { .code = BGP_ERR_LABEL, @@ -250,7 +250,7 @@ static struct ferr_ref ferr_bgp_err[] = { .code = BGP_ERR_EVPN_ROUTE_INVALID, .title = "BGP EVPN route received with invalid contents", .description = "BGP received an EVPN route with invalid contents", - .suggestion = "Determine the source of the EVPN route and resolve whatever is causing\ninvalid contents" + .suggestion = "Determine the source of the EVPN route and resolve whatever is causing invalid contents" }, { .code = BGP_ERR_EVPN_ROUTE_CREATE, @@ -280,7 +280,7 @@ static struct ferr_ref ferr_bgp_err[] = { .code = BGP_ERR_EVPN_INSTANCE_MISMATCH, .title = "BGP EVPN AS and process name mismatch", .description = "BGP configuration has AS and process name mismatch", - .suggestion = "Correct the configuration so that the BGP AS number and instance\nname are consistent" + .suggestion = "Correct the configuration so that the BGP AS number and instance name are consistent" }, { .code = BGP_ERR_FLOWSPEC_PACKET, diff --git a/lib/lib_errors.c b/lib/lib_errors.c index c659a7aae..dcda9955d 100644 --- a/lib/lib_errors.c +++ b/lib/lib_errors.c @@ -26,7 +26,7 @@ static struct ferr_ref ferr_lib_err[] = { .code = LIB_ERR_PRIVILEGES, .title = "Failure to raise or lower privileges", .description = "FRR attempted to raise or lower its privileges and was unable to do so", - .suggestion = "Ensure that you are running FRR as the frr user and that the user has\nSufficient privileges to properly access root privileges" + .suggestion = "Ensure that you are running FRR as the frr user and that the user has sufficient privileges to properly access root privileges" }, { .code = LIB_ERR_VRF_START, @@ -37,14 +37,14 @@ static struct ferr_ref ferr_lib_err[] = { { .code = LIB_ERR_SOCKET, .title = "Socket Error", - .description = "When attempting to access a socket a system error has occured\nand we were unable to properly complete the request", - .suggestion = "Ensure that there are sufficient system resources available and\nensure that the frr user has sufficient permisions to work", + .description = "When attempting to access a socket a system error has occured and we were unable to properly complete the request", + .suggestion = "Ensure that there are sufficient system resources available and ensure that the frr user has sufficient permisions to work", }, { .code = LIB_ERR_ZAPI_MISSMATCH, .title = "ZAPI Error", .description = "A version miss-match has been detected between zebra and client protocol", - .suggestion = "Two different versions of FRR have been installed and the install is\nnot properly setup. Completely stop FRR, remove it from the system and\nreinstall. Typically only developers should see this issue." + .suggestion = "Two different versions of FRR have been installed and the install is not properly setup. Completely stop FRR, remove it from the system and reinstall. Typically only developers should see this issue." }, { .code = LIB_ERR_ZAPI_ENCODE, @@ -61,43 +61,43 @@ static struct ferr_ref ferr_lib_err[] = { { .code = LIB_ERR_SYSTEM_CALL, .title = "System Call Error", - .description = "FRR has detected a error from using a vital system call and has probably\nalready exited", - .suggestion = "Ensure permissions are correct for FRR files, users and groups are correct.\nAdditionally check that sufficient system resources are available." + .description = "FRR has detected a error from using a vital system call and has probably already exited", + .suggestion = "Ensure permissions are correct for FRR files, users and groups are correct. Additionally check that sufficient system resources are available." }, { .code = LIB_ERR_VTY, .title = "VTY Subsystem Error", .description = "FRR has detected a problem with the specified configuration file", - .suggestion = "Ensure configuration file exists and has correct permissions for operations\nAdditionally ensure that all config lines are correct as well", + .suggestion = "Ensure configuration file exists and has correct permissions for operations Additionally ensure that all config lines are correct as well", }, { .code = LIB_ERR_SNMP, .title = "SNMP Subsystem Error", - .description = "FRR has detected a problem with the snmp library it uses\nA callback from this subsystem has indicated some error", + .description = "FRR has detected a problem with the snmp library it uses A callback from this subsystem has indicated some error", .suggestion = "Examine callback message and ensure snmp is properly setup and working" }, { .code = LIB_ERR_INTERFACE, .title = "Interface Subsystem Error", - .description = "FRR has detected a problem with interface data from the kernel as it deviates\nfrom what we would expect to happen via normal netlink messaging", + .description = "FRR has detected a problem with interface data from the kernel as it deviates from what we would expect to happen via normal netlink messaging", .suggestion = "Open an Issue with all relevant log files and restart FRR" }, { .code = LIB_ERR_NS, .title = "NameSpace Subsystem Error", - .description = "FRR has detected a problem with NameSpace data from the kernel as it deviates\nfrom what we would expect to happen via normal kernel messaging", + .description = "FRR has detected a problem with NameSpace data from the kernel as it deviates from what we would expect to happen via normal kernel messaging", .suggestion = "Open an Issue with all relevant log files and restart FRR" }, { .code = LIB_ERR_DEVELOPMENT, .title = "Developmental Escape Error", - .description = "FRR has detected an issue where new development has not properly\nupdated all code paths.", + .description = "FRR has detected an issue where new development has not properly updated all code paths.", .suggestion = "Open an Issue with all relevant log files" }, { .code = LIB_ERR_ZMQ, .title = "ZMQ Subsystem Error", - .description = "FRR has detected an issue with the Zero MQ subsystem and ZeroMQ\nis not working properly now", + .description = "FRR has detected an issue with the Zero MQ subsystem and ZeroMQ is not working properly now", .suggestion = "Open an Issue with all relevant log files and restart FRR" }, { |