commit d70b99e5920d71735acac3c506d1361f28dd8214
author dmcardle <dmcardle@google.com> Thu Dec 12 09:52:39 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Dec 12 09:53:10 2019 -0800
tree c4ab4a6d27563f804d2b9015a3cfd8922379bcc3
parent c60e87a48080b0c08a6c9b4ecaceca5134c0be03

Use quiche string libraries in third_party/quic/qbone

gfe-relnote: n/a, no functional change
PiperOrigin-RevId: 285211107
Change-Id: If6ad2d24c08820393db52b75fe90e7a0f38d6c71

quic/qbone/qbone_packet_processor.h

diff --git a/quic/qbone/qbone_packet_processor.h b/quic/qbone/qbone_packet_processor.h
index 04b7412..e163566 100644
--- a/quic/qbone/qbone_packet_processor.h
+++ b/quic/qbone/qbone_packet_processor.h
@@ -10,7 +10,7 @@
 
 #include "net/third_party/quiche/src/quic/core/quic_types.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_ip_address.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
 
 namespace quic {
 
@@ -52,8 +52,8 @@
    public:
     virtual ~OutputInterface();
 
-    virtual void SendPacketToClient(QuicStringPiece packet) = 0;
-    virtual void SendPacketToNetwork(QuicStringPiece packet) = 0;
+    virtual void SendPacketToClient(quiche::QuicheStringPiece packet) = 0;
+    virtual void SendPacketToNetwork(quiche::QuicheStringPiece packet) = 0;
   };
 
   class StatsInterface {
@@ -94,8 +94,8 @@
     // Note that |output| should not be used except in the DEFER case, as the
     // processor will perform the necessary writes itself.
     virtual ProcessingResult FilterPacket(Direction direction,
-                                          QuicStringPiece full_packet,
-                                          QuicStringPiece payload,
+                                          quiche::QuicheStringPiece full_packet,
+                                          quiche::QuicheStringPiece payload,
                                           icmp6_hdr* icmp_header,
                                           OutputInterface* output);
 
@@ -104,16 +104,19 @@
     // for filtering from the |ipv6_header| argument.  All of those assume that
     // the header is of valid size, which is true for everything passed into
     // FilterPacket().
-    inline uint8_t TransportProtocolFromHeader(QuicStringPiece ipv6_header) {
+    inline uint8_t TransportProtocolFromHeader(
+        quiche::QuicheStringPiece ipv6_header) {
       return ipv6_header[6];
     }
-    inline QuicIpAddress SourceIpFromHeader(QuicStringPiece ipv6_header) {
+    inline QuicIpAddress SourceIpFromHeader(
+        quiche::QuicheStringPiece ipv6_header) {
       QuicIpAddress address;
       address.FromPackedString(&ipv6_header[8],
                                QuicIpAddress::kIPv6AddressSize);
       return address;
     }
-    inline QuicIpAddress DestinationIpFromHeader(QuicStringPiece ipv6_header) {
+    inline QuicIpAddress DestinationIpFromHeader(
+        quiche::QuicheStringPiece ipv6_header) {
       QuicIpAddress address;
       address.FromPackedString(&ipv6_header[24],
                                QuicIpAddress::kIPv6AddressSize);
@@ -164,10 +167,10 @@
                                               icmp6_hdr* icmp_header);
 
   void SendIcmpResponse(icmp6_hdr* icmp_header,
-                        QuicStringPiece original_packet,
+                        quiche::QuicheStringPiece original_packet,
                         Direction original_direction);
 
-  void SendTcpReset(QuicStringPiece original_packet,
+  void SendTcpReset(quiche::QuicheStringPiece original_packet,
                     Direction original_direction);
 
   inline bool IsValid() const { return client_ip_ != kInvalidIpAddress; }
@@ -191,7 +194,8 @@
                                      char** transport_data,
                                      icmp6_hdr* icmp_header);
 
-  void SendResponse(Direction original_direction, QuicStringPiece packet);
+  void SendResponse(Direction original_direction,
+                    quiche::QuicheStringPiece packet);
 };
 
 }  // namespace quic