commit 77cd0a39913f17f3f24b03462f8b4932af79a510
author wub <wub@google.com> Tue Jan 21 12:53:24 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 21 12:54:07 2020 -0800
tree ed0536f56d23702430300fae41bbcfe53ff88180
parent 641ace790c60b93b690930a29398e63f598eeae4

gfe-relnote: (n/a) Change the return value of QuicUdpSocketApi::ReadMultiplePackets from number of good packets to number of total packets read. Code not used yet.

PiperOrigin-RevId: 290802895
Change-Id: I44a83c052ac1fc20b67d8f5708575b2d40cb1cb0

quic/core/quic_udp_socket_posix.cc

diff --git a/quic/core/quic_udp_socket_posix.cc b/quic/core/quic_udp_socket_posix.cc
index f62dbe8..6a5f2d9 100644
--- a/quic/core/quic_udp_socket_posix.cc
+++ b/quic/core/quic_udp_socket_posix.cc
@@ -471,7 +471,6 @@
     return 0;
   }
 
-  size_t num_good_packets = 0;
   for (int i = 0; i < packets_read; ++i) {
     if (hdrs[i].msg_len == 0) {
       continue;
@@ -493,7 +492,6 @@
       continue;
     }
 
-    ++num_good_packets;
     (*results)[i].ok = true;
     (*results)[i].packet_buffer.buffer_len = hdrs[i].msg_len;
 
@@ -511,15 +509,16 @@
       }
     }
   }
-  return num_good_packets;
+  return packets_read;
 #else
   size_t num_packets = 0;
   for (ReadPacketResult& result : *results) {
     result.ok = false;
   }
   for (ReadPacketResult& result : *results) {
+    errno = 0;
     ReadPacket(fd, packet_info_interested, &result);
-    if (!result.ok) {
+    if (!result.ok && errno == EAGAIN) {
       break;
     }
     ++num_packets;