Chromium Code Reviews| 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_session.h" | 5 #include "net/quic/quic_session.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "net/quic/crypto/proof_verifier.h" | 8 #include "net/quic/crypto/proof_verifier.h" |
| 9 #include "net/quic/quic_connection.h" | 9 #include "net/quic/quic_connection.h" |
| 10 #include "net/quic/quic_flags.h" | 10 #include "net/quic/quic_flags.h" |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 480 if (connection_->connected()) { | 480 if (connection_->connected()) { |
| 481 connection_->SendConnectionClose(QUIC_FLOW_CONTROL_INVALID_WINDOW); | 481 connection_->SendConnectionClose(QUIC_FLOW_CONTROL_INVALID_WINDOW); |
| 482 } | 482 } |
| 483 return; | 483 return; |
| 484 } | 484 } |
| 485 | 485 |
| 486 for (DataStreamMap::iterator it = stream_map_.begin(); | 486 for (DataStreamMap::iterator it = stream_map_.begin(); |
| 487 it != stream_map_.end(); ++it) { | 487 it != stream_map_.end(); ++it) { |
| 488 it->second->flow_controller()->UpdateSendWindowOffset(new_window); | 488 it->second->flow_controller()->UpdateSendWindowOffset(new_window); |
| 489 } | 489 } |
| 490 | |
| 491 flow_controller_->UpdateSendWindowOffset(new_window); | |
|
wtc
2014/06/19 00:13:25
This change seems unrelated.
ramant (doing other things)
2014/06/19 01:57:35
Rebase with TOT mixed it up. Rebasing again fixed
| |
| 490 } | 492 } |
| 491 | 493 |
| 492 void QuicSession::OnNewSessionFlowControlWindow(uint32 new_window) { | 494 void QuicSession::OnNewSessionFlowControlWindow(uint32 new_window) { |
| 493 if (new_window < kDefaultFlowControlSendWindow) { | 495 if (new_window < kDefaultFlowControlSendWindow) { |
| 494 LOG(ERROR) | 496 LOG(ERROR) |
| 495 << "Peer sent us an invalid session flow control send window: " | 497 << "Peer sent us an invalid session flow control send window: " |
| 496 << new_window << ", below default: " << kDefaultFlowControlSendWindow; | 498 << new_window << ", below default: " << kDefaultFlowControlSendWindow; |
| 497 if (connection_->connected()) { | 499 if (connection_->connected()) { |
| 498 connection_->SendConnectionClose(QUIC_FLOW_CONTROL_INVALID_WINDOW); | 500 connection_->SendConnectionClose(QUIC_FLOW_CONTROL_INVALID_WINDOW); |
| 499 } | 501 } |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 714 // with a different version. | 716 // with a different version. |
| 715 for (DataStreamMap::iterator it = stream_map_.begin(); | 717 for (DataStreamMap::iterator it = stream_map_.begin(); |
| 716 it != stream_map_.end(); ++it) { | 718 it != stream_map_.end(); ++it) { |
| 717 if (version < QUIC_VERSION_17) { | 719 if (version < QUIC_VERSION_17) { |
| 718 it->second->flow_controller()->Disable(); | 720 it->second->flow_controller()->Disable(); |
| 719 } | 721 } |
| 720 } | 722 } |
| 721 } | 723 } |
| 722 | 724 |
| 723 } // namespace net | 725 } // namespace net |
| OLD | NEW |