[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] vchan-socket-proxy: Move perror() into connect_socket
commit fbdf181fe36516d74b77217207565e87511bf805 Author: Jason Andryuk <jandryuk@xxxxxxxxx> AuthorDate: Wed Jun 10 23:29:29 2020 -0400 Commit: Wei Liu <wl@xxxxxxx> CommitDate: Fri Jun 26 11:59:41 2020 +0000 vchan-socket-proxy: Move perror() into connect_socket 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@xxxxxxxxx> Acked-by: Wei Liu <wl@xxxxxxx> Reviewed-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx> Release-acked-by: Paul Durrant <paul@xxxxxxx> --- 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) -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |