From aa9b150386d31ad1451420334bc0acf4eeee621b Mon Sep 17 00:00:00 2001 From: DavidBar-On Date: Sun, 5 Jan 2025 11:14:49 +0200 Subject: [PATCH] JSON_Read() warning messages enhancements --- src/iperf_api.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/iperf_api.c b/src/iperf_api.c index fa06dc830..87efb37fe 100644 --- a/src/iperf_api.c +++ b/src/iperf_api.c @@ -2761,6 +2761,7 @@ JSON_read(int fd, int max_size) char *str; cJSON *json = NULL; int rc; + char msg_buf[WARN_STR_LEN * 2]; /* * Read a four-byte integer, which is the length of the JSON to follow. @@ -2788,19 +2789,27 @@ JSON_read(int fd, int max_size) json = cJSON_Parse(str); } else { - warning("JSON size of data read does not correspond to offered length"); + sprintf(msg_buf, "JSON size of data read does not correspond to offered length - expected %d bytes but received %d; errno=%d", hsize, rc, errno); + warning(msg_buf); } } + else { + sprintf(msg_buf, "JSON data read failed; errno=%d", errno); + warning(msg_buf); + } free(str); } } } else { - warning("JSON data length overflow"); + sprintf(msg_buf, "JSON data length overflow - %d bytes JSON size is not allowed", hsize); + warning(msg_buf); } } else { warning("Failed to read JSON data size"); + sprintf(msg_buf, "Failed to read JSON data size - read returned %d; errno=%d", rc, errno); + warning(msg_buf); } return json; }