Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

net/tools/quic/quic_dispatcher.cc

Index: net/tools/quic/quic_dispatcher.cc
diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc
index 03656661d14e8315b743560c3eda9795069bdbf1..124148c84e1fcbb53bef2d6e296f08915a1c2d56 100644
--- a/net/tools/quic/quic_dispatcher.cc
+++ b/net/tools/quic/quic_dispatcher.cc
@@ -714,13 +714,6 @@ void QuicDispatcher::BufferEarlyPacket(QuicConnectionId connection_id) {
 }
 
 void QuicDispatcher::ProcessChlo() {
-  QUIC_BUG_IF(!FLAGS_quic_buffer_packet_till_chlo &&
-              FLAGS_quic_limit_num_new_sessions_per_epoll_loop)
-      << "Try to limit connection creation per epoll event while not "
-         "supporting packet buffer. "
-         "--quic_limit_num_new_sessions_per_epoll_loop = true "
-         "--quic_buffer_packet_till_chlo = false";
-
   if (FLAGS_quic_create_session_after_insertion &&
       !buffered_packets_.HasBufferedPackets(current_connection_id_) &&
       !ShouldCreateOrBufferPacketForConnection(current_connection_id_)) {
@@ -728,7 +721,6 @@ void QuicDispatcher::ProcessChlo() {
   }
 
   if (FLAGS_quic_limit_num_new_sessions_per_epoll_loop &&
-      FLAGS_quic_buffer_packet_till_chlo &&
       new_sessions_allowed_per_event_loop_ <= 0) {
     // Can't create new session any more. Wait till next event loop.
     if (!buffered_packets_.HasChloForConnection(current_connection_id_)) {
@@ -759,8 +751,7 @@ void QuicDispatcher::ProcessChlo() {
   std::list<BufferedPacket> packets =
       buffered_packets_.DeliverPackets(current_connection_id_);
   // Check if CHLO is the first packet arrived on this connection.
-  if (!FLAGS_quic_create_session_after_insertion &&
-      FLAGS_quic_buffer_packet_till_chlo && packets.empty()) {
+  if (!FLAGS_quic_create_session_after_insertion && packets.empty()) {
     ShouldCreateOrBufferPacketForConnection(current_connection_id_);
   }
   // Process CHLO at first.
@@ -770,8 +761,7 @@ void QuicDispatcher::ProcessChlo() {
   // Do this even when flag is off because there might be still some packets
   // buffered in the store before flag is turned off.
   DeliverPacketsToSession(packets, session);
-  if (FLAGS_quic_limit_num_new_sessions_per_epoll_loop &&
-      FLAGS_quic_buffer_packet_till_chlo) {
+  if (FLAGS_quic_limit_num_new_sessions_per_epoll_loop) {
     --new_sessions_allowed_per_event_loop_;
   }
 }
@@ -843,8 +833,7 @@ void QuicDispatcher::MaybeRejectStatelessly(QuicConnectionId connection_id,
       header.public_header.versions.front() <= QUIC_VERSION_32 ||
       !ShouldAttemptCheapStatelessRejection()) {
     // Not use cheap stateless reject.
-    if (FLAGS_quic_buffer_packet_till_chlo &&
-        !ChloExtractor::Extract(*current_packet_, GetSupportedVersions(),
+    if (!ChloExtractor::Extract(*current_packet_, GetSupportedVersions(),
                                 nullptr)) {
       // Buffer non-CHLO packets.
       ProcessUnauthenticatedHeaderFate(kFateBuffer, connection_id,
@@ -865,16 +854,6 @@ void QuicDispatcher::MaybeRejectStatelessly(QuicConnectionId connection_id,
                           rejector.get());
   if (!ChloExtractor::Extract(*current_packet_, GetSupportedVersions(),
                               &validator)) {
-    if (!FLAGS_quic_buffer_packet_till_chlo) {
-      QUIC_BUG
-          << "Have to drop packet because buffering non-chlo packet is "
-             "not supported while trying to do stateless reject. "
-             "--gfe2_reloadable_flag_quic_buffer_packet_till_chlo false"
-             " --gfe2_reloadable_flag_quic_use_cheap_stateless_rejects true";
-      ProcessUnauthenticatedHeaderFate(kFateDrop, connection_id,
-                                       header.packet_number);
-      return;
-    }
     ProcessUnauthenticatedHeaderFate(kFateBuffer, connection_id,
                                      header.packet_number);
     return;