commit 1dc01cf32edd7922605d48a27a179ce420e768fc
author wub <wub@google.com> Mon Jan 27 13:04:14 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Jan 27 13:04:51 2020 -0800
tree 73c5eda82ae1d1f0d5577fb45bc0dd8ff62f34df
parent afa90ab643a5ad41158fa70dec0f45dc05b26d34

gfe-relnote: In QuicPacketReader, change the use of QuicSocketUtils to QuicUdpSocketApi. Protected by --gfe2_restart_flag_quic_remove_quic_socket_utils_from_packet_reader.

PiperOrigin-RevId: 291783340
Change-Id: I66bf260d8d963a8b362f5ffefd96b7a16f7c6c24

quic/core/quic_udp_socket.h

diff --git a/quic/core/quic_udp_socket.h b/quic/core/quic_udp_socket.h
index b60386f..8be9e57 100644
--- a/quic/core/quic_udp_socket.h
+++ b/quic/core/quic_udp_socket.h
@@ -59,6 +59,8 @@
  public:
   BitMask64 bitmask() const { return bitmask_; }
 
+  void Reset() { bitmask_.ClearAll(); }
+
   bool HasValue(QuicUdpPacketInfoBit bit) const { return bitmask_.IsSet(bit); }
 
   QuicPacketCount dropped_packets() const {
@@ -129,6 +131,11 @@
     bitmask_.Set(QuicUdpPacketInfoBit::TTL);
   }
 
+  BufferSpan google_packet_headers() const {
+    DCHECK(HasValue(QuicUdpPacketInfoBit::GOOGLE_PACKET_HEADER));
+    return google_packet_headers_;
+  }
+
   void SetGooglePacketHeaders(BufferSpan google_packet_headers) {
     google_packet_headers_ = google_packet_headers;
     bitmask_.Set(QuicUdpPacketInfoBit::GOOGLE_PACKET_HEADER);
@@ -183,15 +190,26 @@
     QuicUdpPacketInfo packet_info;
     BufferSpan packet_buffer;
     BufferSpan control_buffer;
+
+    void Reset(size_t packet_buffer_length) {
+      ok = false;
+      packet_info.Reset();
+      packet_buffer.buffer_len = packet_buffer_length;
+    }
   };
   // Read a packet from |fd|:
   // packet_info_interested: Bitmask indicating what information caller wants to
   //                         receive into |result->packet_info|.
   // result->packet_info:    Received per packet information.
   // result->packet_buffer:  The packet buffer, to be filled with packet data.
+  //                         |result->packet_buffer.buffer_len| is set to the
+  //                         packet length on a successful return.
   // result->control_buffer: The control buffer, used by ReadPacket internally.
   //                         It is recommended to be at least 512 bytes.
   // result->ok:             True iff a packet is successfully received.
+  //
+  // If |*result| is reused for subsequent ReadPacket() calls, caller needs to
+  // call result->Reset() before each ReadPacket().
   void ReadPacket(QuicUdpSocketFd fd,
                   BitMask64 packet_info_interested,
                   ReadPacketResult* result);