From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 9 Nov 2020 16:40:37 +0000 (-0500)
Subject: port: shutdown(2) can return ENOTCONN on FreeBSD
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7d1f4920efe33a4d025b9ba632ffbe73557d9636;p=lttng-tools.git

port: shutdown(2) can return ENOTCONN on FreeBSD

On FreeBSD shutdown(2) will return ENOTCONN when called on a
disconnected socket which is not the case on Linux. It will however
still run the shutdown code on the socket and wakeup threads waiting on
the socket, so we can safely ignore this specific error.

For more details see this bug report:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227259

Change-Id: I0046382ab996060f940dd1283d18447792cf1fd3
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/unix.cpp b/src/common/unix.cpp
index 0a1b1a5a5..0548aaccb 100644
--- a/src/common/unix.cpp
+++ b/src/common/unix.cpp
@@ -379,7 +379,16 @@ int lttcomm_close_unix_sock(int sock)
 	/* Shutdown receptions and transmissions */
 	ret = shutdown(sock, SHUT_RDWR);
 	if (ret < 0) {
-		PERROR("shutdown");
+		/*
+		 * The socket is already disconnected, don't error out.
+		 * This doesn't happen on Linux, but it does on FreeBSD, see:
+		 * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227259
+		 */
+		if (errno == ENOTCONN) {
+			ret = 0;
+		} else {
+			PERROR("shutdown");
+		}
 	}
 
 	closeret = close(sock);