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

lib: Convert stream.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 09:27:30 -04:00 committed by Quentin Young
parent 4496fbb36c
commit a2b0f8b803
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/lib_errors.c
View File

@ -28,6 +28,12 @@ static struct log_ref ferr_lib_warn[] = {
.description = "The SNMP AgentX library has returned a warning that we should report to the end user", .description = "The SNMP AgentX library has returned a warning that we should report to the end user",
.suggestion = "Gather Log data and open an Issue.", .suggestion = "Gather Log data and open an Issue.",
}, },
{
.code = LIB_WARN_STREAM,
.title = "The stream subsystem has encountered an error",
.description = "During sanity checking stream.c has detected an error in the data associated with a particular stream",
.suggestion = "Gather log data and open an Issue, restart FRR",
},
{ {
.code = END_FERR, .code = END_FERR,
}, },

1
lib/lib_errors.h
View File

@ -39,6 +39,7 @@ enum lib_log_refs {
LIB_ERR_ZMQ, LIB_ERR_ZMQ,
LIB_ERR_UNAVAILABLE, LIB_ERR_UNAVAILABLE,
LIB_WARN_SNMP, LIB_WARN_SNMP,
LIB_WARN_STREAM,
}; };
extern void lib_error_init(void); extern void lib_error_init(void);

18
lib/stream.c
View File

@ -54,7 +54,8 @@ DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO")
* using stream_put..._at() functions. * using stream_put..._at() functions.
*/ */
#define STREAM_WARN_OFFSETS(S) \ #define STREAM_WARN_OFFSETS(S) \
zlog_warn("&(struct stream): %p, size: %lu, getp: %lu, endp: %lu\n", \ flog_warn(LIB_WARN_STREAM, \
"&(struct stream): %p, size: %lu, getp: %lu, endp: %lu\n", \
(void *)(S), (unsigned long)(S)->size, \ (void *)(S), (unsigned long)(S)->size, \
(unsigned long)(S)->getp, (unsigned long)(S)->endp) (unsigned long)(S)->getp, (unsigned long)(S)->endp)
@ -68,16 +69,16 @@ DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO")
#define STREAM_BOUND_WARN(S, WHAT) \ #define STREAM_BOUND_WARN(S, WHAT) \
do { \ do { \
zlog_warn("%s: Attempt to %s out of bounds", __func__, \ flog_warn(LIB_WARN_STREAM, "%s: Attempt to %s out of bounds", \
(WHAT)); \ __func__, (WHAT)); \
STREAM_WARN_OFFSETS(S); \ STREAM_WARN_OFFSETS(S); \
assert(0); \ assert(0); \
} while (0) } while (0)
#define STREAM_BOUND_WARN2(S, WHAT) \ #define STREAM_BOUND_WARN2(S, WHAT) \
do { \ do { \
zlog_warn("%s: Attempt to %s out of bounds", __func__, \ flog_warn(LIB_WARN_STREAM, "%s: Attempt to %s out of bounds", \
(WHAT)); \ __func__, (WHAT)); \
STREAM_WARN_OFFSETS(S); \ STREAM_WARN_OFFSETS(S); \
} while (0) } while (0)
@ -85,7 +86,8 @@ DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO")
#define CHECK_SIZE(S, Z) \ #define CHECK_SIZE(S, Z) \
do { \ do { \
if (((S)->endp + (Z)) > (S)->size) { \ if (((S)->endp + (Z)) > (S)->size) { \
zlog_warn( \ flog_warn( \
LIB_WARN_STREAM, \
"CHECK_SIZE: truncating requested size %lu\n", \ "CHECK_SIZE: truncating requested size %lu\n", \
(unsigned long)(Z)); \ (unsigned long)(Z)); \
STREAM_WARN_OFFSETS(S); \ STREAM_WARN_OFFSETS(S); \
@ -966,7 +968,7 @@ ssize_t stream_read_try(struct stream *s, int fd, size_t size)
/* Error: was it transient (return -2) or fatal (return -1)? */ /* Error: was it transient (return -2) or fatal (return -1)? */
if (ERRNO_IO_RETRY(errno)) if (ERRNO_IO_RETRY(errno))
return -2; return -2;
zlog_warn("%s: read failed on fd %d: %s", __func__, fd, flog_err(LIB_ERR_SOCKET, "%s: read failed on fd %d: %s", __func__, fd,
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
} }
@ -997,7 +999,7 @@ ssize_t stream_recvfrom(struct stream *s, int fd, size_t size, int flags,
/* Error: was it transient (return -2) or fatal (return -1)? */ /* Error: was it transient (return -2) or fatal (return -1)? */
if (ERRNO_IO_RETRY(errno)) if (ERRNO_IO_RETRY(errno))
return -2; return -2;
zlog_warn("%s: read failed on fd %d: %s", __func__, fd, flog_err(LIB_ERR_SOCKET, "%s: read failed on fd %d: %s", __func__, fd,
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
} }