| OLD | NEW |
| 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 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1459 << sequence_number << " since the connection is forward secure."; | 1459 << sequence_number << " since the connection is forward secure."; |
| 1460 LOG_IF(DFATAL, | 1460 LOG_IF(DFATAL, |
| 1461 sent_packet_manager_.HasRetransmittableFrames(sequence_number)) | 1461 sent_packet_manager_.HasRetransmittableFrames(sequence_number)) |
| 1462 << "Once forward secure, all NULL encrypted packets should be " | 1462 << "Once forward secure, all NULL encrypted packets should be " |
| 1463 << "neutered."; | 1463 << "neutered."; |
| 1464 return true; | 1464 return true; |
| 1465 } | 1465 } |
| 1466 | 1466 |
| 1467 if (retransmittable == HAS_RETRANSMITTABLE_DATA && | 1467 if (retransmittable == HAS_RETRANSMITTABLE_DATA && |
| 1468 !sent_packet_manager_.HasRetransmittableFrames(sequence_number)) { | 1468 !sent_packet_manager_.HasRetransmittableFrames(sequence_number)) { |
| 1469 LOG(DFATAL) << ENDPOINT << "Dropping unacked packet: " << sequence_number | 1469 DVLOG(1) << ENDPOINT << "Dropping unacked packet: " << sequence_number |
| 1470 << " This should have been removed when it was Neutered."; | 1470 << " A previous transmission was acked while write blocked."; |
| 1471 return true; | 1471 return true; |
| 1472 } | 1472 } |
| 1473 | 1473 |
| 1474 return false; | 1474 return false; |
| 1475 } | 1475 } |
| 1476 | 1476 |
| 1477 bool QuicConnection::OnPacketSent(WriteResult result) { | 1477 bool QuicConnection::OnPacketSent(WriteResult result) { |
| 1478 DCHECK_NE(WRITE_STATUS_BLOCKED, result.status); | 1478 DCHECK_NE(WRITE_STATUS_BLOCKED, result.status); |
| 1479 if (pending_write_.get() == NULL) { | 1479 if (pending_write_.get() == NULL) { |
| 1480 LOG(DFATAL) << "OnPacketSent called without a pending write."; | 1480 LOG(DFATAL) << "OnPacketSent called without a pending write."; |
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1965 // If we changed the generator's batch state, restore original batch state. | 1965 // If we changed the generator's batch state, restore original batch state. |
| 1966 if (!already_in_batch_mode_) { | 1966 if (!already_in_batch_mode_) { |
| 1967 DVLOG(1) << "Leaving Batch Mode."; | 1967 DVLOG(1) << "Leaving Batch Mode."; |
| 1968 connection_->packet_generator_.FinishBatchOperations(); | 1968 connection_->packet_generator_.FinishBatchOperations(); |
| 1969 } | 1969 } |
| 1970 DCHECK_EQ(already_in_batch_mode_, | 1970 DCHECK_EQ(already_in_batch_mode_, |
| 1971 connection_->packet_generator_.InBatchMode()); | 1971 connection_->packet_generator_.InBatchMode()); |
| 1972 } | 1972 } |
| 1973 | 1973 |
| 1974 } // namespace net | 1974 } // namespace net |
| OLD | NEW |