X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.cpp;h=72bf30b7ec10589ce797b83af494bc6f7e782e78;hb=942003e52b8fe43bfb8f28a1884d3bda7e6d1e0b;hp=942bfa4d5ab3abded6b6031e0498042e5e1dfbb9;hpb=c5c79321eb1937f3d208210365c512f4a186ec2a;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index 942bfa4d5..72bf30b7e 100644
--- a/src/bin/lttng-relayd/main.cpp
+++ b/src/bin/lttng-relayd/main.cpp
@@ -49,6 +49,7 @@
 #include <common/sessiond-comm/relayd.h>
 #include <common/uri.h>
 #include <common/utils.h>
+#include <common/path.h>
 #include <common/align.h>
 #include <common/ini-config/ini-config.h>
 #include <common/dynamic-buffer.h>
@@ -3404,7 +3405,10 @@ static enum relay_connection_status relay_process_control_receive_payload(
 			reception_buffer->data + state->received,
 			state->left_to_receive, MSG_DONTWAIT);
 	if (ret < 0) {
+		DIAGNOSTIC_PUSH
+		DIAGNOSTIC_IGNORE_LOGICAL_OP
 		if (errno != EAGAIN && errno != EWOULDBLOCK) {
+		DIAGNOSTIC_POP
 			PERROR("Unable to receive command payload on sock %d",
 					conn->sock->fd);
 			status = RELAY_CONNECTION_STATUS_ERROR;
@@ -3477,7 +3481,10 @@ static enum relay_connection_status relay_process_control_receive_header(
 			reception_buffer->data + state->received,
 			state->left_to_receive, MSG_DONTWAIT);
 	if (ret < 0) {
+		DIAGNOSTIC_PUSH
+		DIAGNOSTIC_IGNORE_LOGICAL_OP
 		if (errno != EAGAIN && errno != EWOULDBLOCK) {
+		DIAGNOSTIC_POP
 			PERROR("Unable to receive control command header on sock %d",
 					conn->sock->fd);
 			status = RELAY_CONNECTION_STATUS_ERROR;
@@ -3588,7 +3595,10 @@ static enum relay_connection_status relay_process_data_receive_header(
 			state->header_reception_buffer + state->received,
 			state->left_to_receive, MSG_DONTWAIT);
 	if (ret < 0) {
+		DIAGNOSTIC_PUSH
+		DIAGNOSTIC_IGNORE_LOGICAL_OP
 		if (errno != EAGAIN && errno != EWOULDBLOCK) {
+		DIAGNOSTIC_POP
 			PERROR("Unable to receive data header on sock %d", conn->sock->fd);
 			status = RELAY_CONNECTION_STATUS_ERROR;
 		}
@@ -3715,7 +3725,10 @@ static enum relay_connection_status relay_process_data_receive_payload(
 		ret = conn->sock->ops->recvmsg(conn->sock, data_buffer,
 				recv_size, MSG_DONTWAIT);
 		if (ret < 0) {
+			DIAGNOSTIC_PUSH
+			DIAGNOSTIC_IGNORE_LOGICAL_OP
 			if (errno != EAGAIN && errno != EWOULDBLOCK) {
+			DIAGNOSTIC_POP
 				PERROR("Socket %d error", conn->sock->fd);
 				status = RELAY_CONNECTION_STATUS_ERROR;
 			}