From 53a8c5c4cdf8cff1dfd19c25319c114d8a7805be Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 29 Nov 2020 20:58:59 +0800 Subject: [PATCH] [patch tracking] 20201129205849773219 - https://github.com/iputils/iputils/commit/2583fb77dd57c5183998177a3fa13a680b573005 --- ...fb77dd57c5183998177a3fa13a680b573005.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 2583fb77dd57c5183998177a3fa13a680b573005.patch diff --git a/2583fb77dd57c5183998177a3fa13a680b573005.patch b/2583fb77dd57c5183998177a3fa13a680b573005.patch new file mode 100644 index 0000000..3010c06 --- /dev/null +++ b/2583fb77dd57c5183998177a3fa13a680b573005.patch @@ -0,0 +1,34 @@ +diff --git a/ping/ping.c b/ping/ping.c +index e277697..d96298e 100644 +--- a/ping/ping.c ++++ b/ping/ping.c +@@ -1314,8 +1314,11 @@ int ping4_receive_error_msg(struct ping_rts *rts, socket_st *sock) + msg.msg_controllen = sizeof(cbuf); + + res = recvmsg(sock->fd, &msg, MSG_ERRQUEUE | MSG_DONTWAIT); +- if (res < 0) ++ if (res < 0) { ++ if (errno == EAGAIN || errno == EINTR) ++ local_errors++; + goto out; ++ } + + e = NULL; + for (cmsgh = CMSG_FIRSTHDR(&msg); cmsgh; cmsgh = CMSG_NXTHDR(&msg, cmsgh)) { +diff --git a/ping/ping6_common.c b/ping/ping6_common.c +index 279c533..459f63e 100644 +--- a/ping/ping6_common.c ++++ b/ping/ping6_common.c +@@ -481,8 +481,11 @@ int ping6_receive_error_msg(struct ping_rts *rts, socket_st *sock) + msg.msg_controllen = sizeof(cbuf); + + res = recvmsg(sock->fd, &msg, MSG_ERRQUEUE | MSG_DONTWAIT); +- if (res < 0) ++ if (res < 0) { ++ if (errno == EAGAIN || errno == EINTR) ++ local_errors++; + goto out; ++ } + + e = NULL; + for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {