DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ciara Power <ciara.power@intel.com>
To: dev@dpdk.org
Cc: Ciara Power <ciara.power@intel.com>, Kevin Laatz <kevin.laatz@intel.com>
Subject: [dpdk-dev] [PATCH] test/telemetry: fix error handling for socket
Date: Tue, 13 Oct 2020 17:28:20 +0100	[thread overview]
Message-ID: <20201013162820.6544-1-ciara.power@intel.com> (raw)

When the socket connection failed, an error was printed to screen but
the function did not return an error, and continued to try read from the
socket. This is now corrected to close the socket and return -1 when the
connection fails.

Fixes: bd78cf693ebd ("test/telemetry: add unit tests for data to JSON")

Signed-off-by: Ciara Power <ciara.power@intel.com>
---
 app/test/test_telemetry_data.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/test/test_telemetry_data.c b/app/test/test_telemetry_data.c
index 7a31e68a78..00326867b6 100644
--- a/app/test/test_telemetry_data.c
+++ b/app/test/test_telemetry_data.c
@@ -319,9 +319,12 @@ connect_to_socket(void)
 			"%s/dpdk_telemetry.%s",	rte_eal_get_runtime_dir(),
 			TELEMETRY_VERSION);
 	if (connect(sock, (struct sockaddr *) &telem_addr,
-			sizeof(telem_addr)) < 0)
+			sizeof(telem_addr)) < 0) {
 		printf("\n%s: Error connecting to socket: %s\n", __func__,
 				strerror(errno));
+		close(sock);
+		return -1;
+	}
 
 	bytes = read(sock, buf, sizeof(buf) - 1);
 	if (bytes < 0) {
-- 
2.22.0


             reply	other threads:[~2020-10-13 16:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-13 16:28 Ciara Power [this message]
2020-10-13 16:45 ` Bruce Richardson
2020-10-19 14:50   ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201013162820.6544-1-ciara.power@intel.com \
    --to=ciara.power@intel.com \
    --cc=dev@dpdk.org \
    --cc=kevin.laatz@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).