From: Jason Andryuk <jandryuk@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <ian.jackson@eu.citrix.com>, Wei Liu <wl@xen.org>,
Jason Andryuk <jandryuk@gmail.com>
Subject: [PATCH v2 03/10] vchan-socket-proxy: Move perror() into connect_socket
Date: Wed, 10 Jun 2020 23:29:29 -0400 [thread overview]
Message-ID: <20200611032936.350657-4-jandryuk@gmail.com> (raw)
In-Reply-To: <20200611032936.350657-1-jandryuk@gmail.com>
errno is reset by subsequent system & library calls, so it may be
inaccurate by the time connect_socket returns. Call perror immediately
after failing system calls to print the proper message.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
tools/libvchan/vchan-socket-proxy.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/libvchan/vchan-socket-proxy.c b/tools/libvchan/vchan-socket-proxy.c
index 4edc3a44f5..c6a83e4712 100644
--- a/tools/libvchan/vchan-socket-proxy.c
+++ b/tools/libvchan/vchan-socket-proxy.c
@@ -155,12 +155,15 @@ static int connect_socket(const char *path_or_fd) {
}
fd = socket(AF_UNIX, SOCK_STREAM, 0);
- if (fd == -1)
+ if (fd == -1) {
+ perror("socket");
return -1;
+ }
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, path_or_fd);
if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == -1) {
+ perror("connect");
close(fd);
return -1;
}
@@ -457,7 +460,7 @@ int main(int argc, char **argv)
input_fd = output_fd = connect_socket(socket_path);
}
if (input_fd == -1) {
- perror("connect socket");
+ fprintf(stderr, "connect_socket failed\n");
return 1;
}
if (data_loop(ctrl, input_fd, output_fd) != 0)
--
2.25.1
next prev parent reply other threads:[~2020-06-11 3:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 3:29 [PATCH v2 00/10] Coverity fixes for vchan-socket-proxy Jason Andryuk
2020-06-11 3:29 ` [PATCH v2 01/10] vchan-socket-proxy: Ensure UNIX path NUL terminated Jason Andryuk
2020-06-11 3:29 ` [PATCH v2 02/10] vchan-socket-proxy: Move perror() into listen_socket Jason Andryuk
2020-06-11 3:29 ` Jason Andryuk [this message]
2020-06-11 3:29 ` [PATCH v2 04/10] vchan-socket-proxy: Check xs_watch return value Jason Andryuk
2020-06-11 3:29 ` [PATCH v2 05/10] vchan-socket-proxy: Unify main " Jason Andryuk
2020-06-11 3:29 ` [PATCH v2 06/10] vchan-socket-proxy: Use a struct to store state Jason Andryuk
2020-06-11 3:29 ` [PATCH v2 07/10] vchan-socket-proxy: Switch data_loop() to take state Jason Andryuk
2020-06-11 3:29 ` [PATCH v2 08/10] vchan-socket-proxy: Set closed FDs to -1 Jason Andryuk
2020-06-11 3:29 ` [PATCH v2 09/10] vchan-socket-proxy: Cleanup resources on exit Jason Andryuk
2020-06-11 3:29 ` [PATCH v2 10/10] vchan-socket-proxy: Handle closing shared input/output_fd Jason Andryuk
2020-06-26 10:18 ` [PATCH v2 00/10] Coverity fixes for vchan-socket-proxy Wei Liu
2020-06-26 10:41 ` Paul Durrant
2020-06-26 11:12 ` Marek Marczykowski-Górecki
2020-06-26 11:31 ` Wei Liu
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=20200611032936.350657-4-jandryuk@gmail.com \
--to=jandryuk@gmail.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/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).