Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Side by Side Diff: net/quic/quic_connection.cc

Issue 605263003: Remove OnPacketRetransmitted from QuicConnectionDebugVisitor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Final_0925
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/quic/quic_connection.h ('k') | net/quic/quic_connection_logger.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_connection.h" 5 #include "net/quic/quic_connection.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9 #include <algorithm> 9 #include <algorithm>
10 #include <iterator> 10 #include <iterator>
(...skipping 1328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 ++stats_.packets_discarded; 1339 ++stats_.packets_discarded;
1340 return true; 1340 return true;
1341 } 1341 }
1342 // Connection close packets are encrypted and saved, so don't exit early. 1342 // Connection close packets are encrypted and saved, so don't exit early.
1343 if (writer_->IsWriteBlocked() && !IsConnectionClose(*packet)) { 1343 if (writer_->IsWriteBlocked() && !IsConnectionClose(*packet)) {
1344 return false; 1344 return false;
1345 } 1345 }
1346 1346
1347 QuicPacketSequenceNumber sequence_number = 1347 QuicPacketSequenceNumber sequence_number =
1348 packet->serialized_packet.sequence_number; 1348 packet->serialized_packet.sequence_number;
1349 // Some encryption algorithms require the packet sequence numbers not be
1350 // repeated.
1351 DCHECK_LE(sequence_number_of_last_sent_packet_, sequence_number); 1349 DCHECK_LE(sequence_number_of_last_sent_packet_, sequence_number);
1352 sequence_number_of_last_sent_packet_ = sequence_number; 1350 sequence_number_of_last_sent_packet_ = sequence_number;
1353 1351
1354 QuicEncryptedPacket* encrypted = framer_.EncryptPacket( 1352 QuicEncryptedPacket* encrypted = framer_.EncryptPacket(
1355 packet->encryption_level, 1353 packet->encryption_level,
1356 sequence_number, 1354 sequence_number,
1357 *packet->serialized_packet.packet); 1355 *packet->serialized_packet.packet);
1358 if (encrypted == NULL) { 1356 if (encrypted == NULL) {
1359 LOG(DFATAL) << ENDPOINT << "Failed to encrypt packet number " 1357 LOG(DFATAL) << ENDPOINT << "Failed to encrypt packet number "
1360 << sequence_number; 1358 << sequence_number;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 WriteResult result = writer_->WritePacket(encrypted->data(), 1398 WriteResult result = writer_->WritePacket(encrypted->data(),
1401 encrypted->length(), 1399 encrypted->length(),
1402 self_address().address(), 1400 self_address().address(),
1403 peer_address()); 1401 peer_address());
1404 if (result.error_code == ERR_IO_PENDING) { 1402 if (result.error_code == ERR_IO_PENDING) {
1405 DCHECK_EQ(WRITE_STATUS_BLOCKED, result.status); 1403 DCHECK_EQ(WRITE_STATUS_BLOCKED, result.status);
1406 } 1404 }
1407 if (debug_visitor_.get() != NULL) { 1405 if (debug_visitor_.get() != NULL) {
1408 // Pass the write result to the visitor. 1406 // Pass the write result to the visitor.
1409 debug_visitor_->OnPacketSent(sequence_number, 1407 debug_visitor_->OnPacketSent(sequence_number,
1408 packet->original_sequence_number,
1410 packet->encryption_level, 1409 packet->encryption_level,
1411 packet->transmission_type, 1410 packet->transmission_type,
1412 *encrypted, 1411 *encrypted,
1413 result); 1412 result);
1414 } 1413 }
1415 1414
1416 if (result.status == WRITE_STATUS_BLOCKED) { 1415 if (result.status == WRITE_STATUS_BLOCKED) {
1417 visitor_->OnWriteBlocked(); 1416 visitor_->OnWriteBlocked();
1418 // If the socket buffers the the data, then the packet should not 1417 // If the socket buffers the the data, then the packet should not
1419 // be queued and sent again, which would result in an unnecessary 1418 // be queued and sent again, which would result in an unnecessary
(...skipping 11 matching lines...) Expand all
1431 DVLOG(1) << ENDPOINT << "time of last sent packet: " 1430 DVLOG(1) << ENDPOINT << "time of last sent packet: "
1432 << now.ToDebuggingValue(); 1431 << now.ToDebuggingValue();
1433 1432
1434 // TODO(ianswett): Change the sequence number length and other packet creator 1433 // TODO(ianswett): Change the sequence number length and other packet creator
1435 // options by a more explicit API than setting a struct value directly, 1434 // options by a more explicit API than setting a struct value directly,
1436 // perhaps via the NetworkChangeVisitor. 1435 // perhaps via the NetworkChangeVisitor.
1437 packet_generator_.UpdateSequenceNumberLength( 1436 packet_generator_.UpdateSequenceNumberLength(
1438 sent_packet_manager_.least_packet_awaited_by_peer(), 1437 sent_packet_manager_.least_packet_awaited_by_peer(),
1439 sent_packet_manager_.GetCongestionWindow()); 1438 sent_packet_manager_.GetCongestionWindow());
1440 1439
1441 if (packet->original_sequence_number != 0 && debug_visitor_.get() != NULL) {
1442 debug_visitor_->OnPacketRetransmitted(
1443 packet->original_sequence_number, sequence_number);
1444 }
1445 bool reset_retransmission_alarm = sent_packet_manager_.OnPacketSent( 1440 bool reset_retransmission_alarm = sent_packet_manager_.OnPacketSent(
1446 &packet->serialized_packet, 1441 &packet->serialized_packet,
1447 packet->original_sequence_number, 1442 packet->original_sequence_number,
1448 now, 1443 now,
1449 encrypted->length(), 1444 encrypted->length(),
1450 packet->transmission_type, 1445 packet->transmission_type,
1451 IsRetransmittable(*packet)); 1446 IsRetransmittable(*packet));
1452 1447
1453 if (reset_retransmission_alarm || !retransmission_alarm_->IsSet()) { 1448 if (reset_retransmission_alarm || !retransmission_alarm_->IsSet()) {
1454 retransmission_alarm_->Update(sent_packet_manager_.GetRetransmissionTime(), 1449 retransmission_alarm_->Update(sent_packet_manager_.GetRetransmissionTime(),
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
2026 } 2021 }
2027 for (size_t i = 0; i < retransmittable_frames->frames().size(); ++i) { 2022 for (size_t i = 0; i < retransmittable_frames->frames().size(); ++i) {
2028 if (retransmittable_frames->frames()[i].type == CONNECTION_CLOSE_FRAME) { 2023 if (retransmittable_frames->frames()[i].type == CONNECTION_CLOSE_FRAME) {
2029 return true; 2024 return true;
2030 } 2025 }
2031 } 2026 }
2032 return false; 2027 return false;
2033 } 2028 }
2034 2029
2035 } // namespace net 2030 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_connection.h ('k') | net/quic/quic_connection_logger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698