X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=257dfc89aeaa63d368486f47ff5ec7468656a6a8;hb=e5b83100577f6b378e89c8c7ccbba5892be9d50a;hp=b40465b38ebef7d987381ad82a5353524ef57a7a;hpb=8960e9cd5adb7e5cdaece135530a457cd65324dc;p=lttng-tools.git diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c index b40465b38..257dfc89a 100644 --- a/src/bin/lttng/utils.c +++ b/src/bin/lttng/utils.c @@ -341,7 +341,8 @@ int check_relayd(void) fd = socket(AF_INET, SOCK_STREAM, 0); if (fd < 0) { perror("socket check relayd"); - goto error; + ret = -1; + goto error_socket; } sin.sin_family = AF_INET; @@ -349,6 +350,7 @@ int check_relayd(void) ret = inet_pton(sin.sin_family, "127.0.0.1", &sin.sin_addr); if (ret < 1) { perror("inet_pton check relayd"); + ret = -1; goto error; } @@ -365,8 +367,10 @@ int check_relayd(void) ret = 1; } - return ret; - error: - return -1; + if (close(fd) < 0) { + perror("close relayd fd"); + } +error_socket: + return ret; }