commit | a8fb60cbd034ddf1c45e592e2e85b394d3741739 | [log] [tgz] |
---|---|---|
author | rtenneti <[email protected]> | Thu Sep 10 18:17:57 2015 |
committer | Commit bot <[email protected]> | Thu Sep 10 18:18:26 2015 |
tree | f11a21e909ef5c86db5bbb3d06be05a8c7bc7d5a | |
parent | e4eefb3c2a2eb2573393756c606f830fecd38ac2 [diff] [blame] |
Landing Recent QUIC changes until 8/26/2015 19:47 UTC. Fix code relying on undocumented SimpleAtoi quirk, which caused rollback of cl/101239633. The quirk was that if an input contained null byte, everything past this byte would be silently ignored; this behavior will soon be removed. relnote: n/a (only affects tests) passes with strings change patched in. Ported this server side change to keep code similar to internal code. Merge internal change: 101605155 https://codereview.chromium.org/1308323012/ relnote: clang_tidy (tidy up). Fixed include order. Merge internal change: 101595102 https://codereview.chromium.org/1321663007/ relnote: Deprecate FLAGS_quic_allow_ip_migration. Merge internal change: 101489487 https://codereview.chromium.org/1334583002/ relnote: Cache-align the encryption buffer in QuicPacketGenerator::SerializeAndSendPacket. The optimized crypto algorithms operate best on aligned memory. This saves about 0.6% wall time and 0.6% CPU time in QUIC. Merge internal change: 101462412 https://codereview.chromium.org/1327743005/ relnote: Close the QUIC connection when a packet is about to be sent out of order instead of attempting to send it. Merge internal change: 101391398 https://codereview.chromium.org/1304833006/ relnote: Deprecate FLAGS_quic_dont_write_when_flow_unblocked. Merge internal change: 101389540 https://codereview.chromium.org/1329693006/ relnote: Don't add burst tokens to QUIC's PacingSender when in recovery. Reduces over-aggressive sending at small CWNDs. Merge internal change: 101384906 https://codereview.chromium.org/1313623006/ [email protected] Review URL: https://codereview.chromium.org/1335443002 Cr-Commit-Position: refs/heads/master@{#348191}
diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h index 0b915cb..d9f46960 100644 --- a/net/quic/quic_sent_packet_manager.h +++ b/net/quic/quic_sent_packet_manager.h
@@ -228,7 +228,11 @@ return unacked_packets_.largest_observed(); } - QuicPacketNumber least_packet_awaited_by_peer() { + QuicPacketNumber largest_sent_packet() const { + return unacked_packets_.largest_sent_packet(); + } + + QuicPacketNumber least_packet_awaited_by_peer() const { return least_packet_awaited_by_peer_; }