Landing Recent QUIC changes until and including Mon Nov 16 14:15:48 2015

net/tools/quic/quic_packet_reader.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_packet_reader.h"
 
 #include <errno.h>
 #ifndef __APPLE__
 // This is a GNU header that is not present in /usr/include on MacOS
 #include <features.h>
@@ skipping 86 matching lines @@
                                mmsg_hdr_[i].msg_len, false);
     IPEndPoint server_address(server_ip, port);
     processor->ProcessPacket(server_address, client_address, packet);
   }
 
   if (packets_dropped != nullptr) {
     QuicSocketUtils::GetOverflowFromMsghdr(&mmsg_hdr_[0].msg_hdr,
                                            packets_dropped);
   }
 
-  if (FLAGS_quic_read_packets_full_recvmmsg) {
-    // We may not have read all of the packets available on the socket.
-    return packets_read == kNumPacketsPerReadMmsgCall;
-  } else {
-    return true;
-  }
+  // We may not have read all of the packets available on the socket.
+  return packets_read == kNumPacketsPerReadMmsgCall;
 #else
   LOG(FATAL) << "Unsupported";
   return false;
 #endif
 }
 
 /* static */
 bool QuicPacketReader::ReadAndDispatchSinglePacket(
     int fd,
     int port,
@@ skipping 17 matching lines @@
   processor->ProcessPacket(server_address, client_address, packet);
 
   // The socket read was successful, so return true even if packet dispatch
   // failed.
   return true;
 }
 
 }  // namespace tools
 
 }  // namespace net