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

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index 33684addd..72bf30b7e 100644
--- a/src/bin/lttng-relayd/main.cpp
+++ b/src/bin/lttng-relayd/main.cpp
@@ -3405,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;
@@ -3478,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;
@@ -3589,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;
 		}
@@ -3716,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;
 			}