| Index: net/quic/core/quic_protocol.h
|
| diff --git a/net/quic/core/quic_protocol.h b/net/quic/core/quic_protocol.h
|
| index 068ef9a387b034a6ac134dd2686979ce185f1633..69bc7f166cf958e3eaac5f332e133e45ba3ac98f 100644
|
| --- a/net/quic/core/quic_protocol.h
|
| +++ b/net/quic/core/quic_protocol.h
|
| @@ -112,8 +112,6 @@ struct NET_EXPORT_PRIVATE QuicPacketHeader {
|
| QuicPacketPublicHeader public_header;
|
| QuicPacketNumber packet_number;
|
| QuicPathId path_id;
|
| - bool entropy_flag;
|
| - QuicPacketEntropyHash entropy_hash;
|
| };
|
|
|
| struct NET_EXPORT_PRIVATE QuicPublicResetPacket {
|
| @@ -224,9 +222,6 @@ struct NET_EXPORT_PRIVATE QuicStopWaitingFrame {
|
| const QuicStopWaitingFrame& s);
|
| // Path which this stop waiting frame belongs to.
|
| QuicPathId path_id;
|
| - // Entropy hash of all packets up to, but not including, the least unacked
|
| - // packet.
|
| - QuicPacketEntropyHash entropy_hash;
|
| // The lowest packet we've sent which is unacked, and we expect an ack for.
|
| QuicPacketNumber least_unacked;
|
| };
|
| @@ -321,13 +316,6 @@ struct NET_EXPORT_PRIVATE QuicAckFrame {
|
| const QuicAckFrame& s);
|
|
|
| // The highest packet number we've observed from the peer.
|
| - //
|
| - // In general, this should be the largest packet number we've received. In
|
| - // the case of truncated acks, we may have to advertise a lower "upper bound"
|
| - // than largest received, to avoid implicitly acking missing packets that
|
| - // don't fit in the missing packet list due to size limitations. In this
|
| - // case, largest_observed may be a packet which is also in the missing packets
|
| - // list.
|
| QuicPacketNumber largest_observed;
|
|
|
| // Time elapsed since largest_observed was received until this Ack frame was
|
| @@ -342,17 +330,6 @@ struct NET_EXPORT_PRIVATE QuicAckFrame {
|
|
|
| // Path which this ack belongs to.
|
| QuicPathId path_id;
|
| -
|
| - // Entropy hash of all packets up to largest observed not including missing
|
| - // packets.
|
| - QuicPacketEntropyHash entropy_hash;
|
| -
|
| - // Whether the ack had to be truncated when sent.
|
| - bool is_truncated;
|
| -
|
| - // If true, |packets| express missing packets. Otherwise, |packets| express
|
| - // received packets.
|
| - bool missing;
|
| };
|
|
|
| // True if the packet number is greater than largest_observed or is listed
|
| @@ -661,8 +638,6 @@ class NET_EXPORT_PRIVATE QuicVersionManager {
|
| const QuicVersionVector& GetSupportedVersions();
|
|
|
| private:
|
| - // FLAGS_quic_disable_pre_34
|
| - bool disable_pre_34_;
|
| // FLAGS_quic_enable_version_35
|
| bool enable_version_35_;
|
| // FLAGS_quic_enable_version_36_v2
|
| @@ -690,7 +665,6 @@ struct NET_EXPORT_PRIVATE SerializedPacket {
|
| QuicPacketNumberLength packet_number_length,
|
| const char* encrypted_buffer,
|
| QuicPacketLength encrypted_length,
|
| - QuicPacketEntropyHash entropy_hash,
|
| bool has_ack,
|
| bool has_stop_waiting);
|
| SerializedPacket(const SerializedPacket& other);
|
| @@ -709,7 +683,6 @@ struct NET_EXPORT_PRIVATE SerializedPacket {
|
| QuicPacketNumber packet_number;
|
| QuicPacketNumberLength packet_number_length;
|
| EncryptionLevel encryption_level;
|
| - QuicPacketEntropyHash entropy_hash;
|
| bool has_ack;
|
| bool has_stop_waiting;
|
| TransmissionType transmission_type;
|
|
|