From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 3 Sep 2018 12:41:48 +0000 (+0200)
Subject: tree-wide: s/recv()/lxc_recv_nointr()/g
X-Git-Tag: lxc-3.1.0~118^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3233f26ceae65609b2195c28bf99f3872ade230;p=thirdparty%2Flxc.git

tree-wide: s/recv()/lxc_recv_nointr()/g

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index db9876935..741210bb4 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -1166,7 +1166,7 @@ static int lxc_cmd_handler(int fd, uint32_t events, void *data,
 			goto out_close;
 		}
 
-		ret = recv(fd, reqdata, req.datalen, 0);
+		ret = lxc_recv_nointr(fd, reqdata, req.datalen, 0);
 		if (ret != req.datalen) {
 			WARN("Failed to receive full command request. Ignoring "
 			     "request for \"%s\"", lxc_cmd_str(req.cmd));
diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
index bb61797c8..d079d7116 100644
--- a/src/lxc/commands_utils.c
+++ b/src/lxc/commands_utils.c
@@ -32,6 +32,7 @@
 #include "commands.h"
 #include "commands_utils.h"
 #include "initutils.h"
+#include "file_utils.h"
 #include "log.h"
 #include "lxclock.h"
 #include "monitor.h"
@@ -61,14 +62,8 @@ int lxc_cmd_sock_rcv_state(int state_client_fd, int timeout)
 
 	memset(&msg, 0, sizeof(msg));
 
-again:
-	ret = recv(state_client_fd, &msg, sizeof(msg), 0);
+	ret = lxc_recv_nointr(state_client_fd, &msg, sizeof(msg), 0);
 	if (ret < 0) {
-		if (errno == EINTR) {
-			TRACE("Caught EINTR; retrying");
-			goto again;
-		}
-
 		SYSERROR("Failed to receive message");
 		return -1;
 	}
diff --git a/src/lxc/network.c b/src/lxc/network.c
index 56ca12b3b..a2a35baf3 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -48,6 +48,7 @@
 #include "af_unix.h"
 #include "conf.h"
 #include "config.h"
+#include "file_utils.h"
 #include "log.h"
 #include "macro.h"
 #include "network.h"
@@ -3081,7 +3082,7 @@ int lxc_network_recv_veth_names_from_parent(struct lxc_handler *handler)
 		if (netdev->type != LXC_NET_VETH)
 			continue;
 
-		ret = recv(data_sock, netdev->name, IFNAMSIZ, 0);
+		ret = lxc_recv_nointr(data_sock, netdev->name, IFNAMSIZ, 0);
 		if (ret < 0)
 			return -1;
 		TRACE("Received network device name \"%s\" from parent", netdev->name);
@@ -3136,14 +3137,14 @@ int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler)
 		/* Receive network device name in the child's namespace to
 		 * parent.
 		 */
-		ret = recv(data_sock, netdev->name, IFNAMSIZ, 0);
+		ret = lxc_recv_nointr(data_sock, netdev->name, IFNAMSIZ, 0);
 		if (ret < 0)
 			return -1;
 
 		/* Receive network device ifindex in the child's namespace to
 		 * parent.
 		 */
-		ret = recv(data_sock, &netdev->ifindex, sizeof(netdev->ifindex), 0);
+		ret = lxc_recv_nointr(data_sock, &netdev->ifindex, sizeof(netdev->ifindex), 0);
 		if (ret < 0)
 			return -1;
 	}