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

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

Issue 372343002: Fix bug in net/quic/quic_reliable_client_stream.cc found by pkastings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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_reliable_client_stream.h" 5 #include "net/quic/quic_reliable_client_stream.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "net/base/net_errors.h" 8 #include "net/base/net_errors.h"
9 #include "net/quic/quic_session.h" 9 #include "net/quic/quic_session.h"
10 #include "net/quic/quic_write_blocked_list.h" 10 #include "net/quic/quic_write_blocked_list.h"
11 11
12 namespace net { 12 namespace net {
13 13
14 QuicReliableClientStream::QuicReliableClientStream(QuicStreamId id, 14 QuicReliableClientStream::QuicReliableClientStream(QuicStreamId id,
15 QuicSession* session, 15 QuicSession* session,
16 const BoundNetLog& net_log) 16 const BoundNetLog& net_log)
17 : QuicDataStream(id, session), 17 : QuicDataStream(id, session),
18 net_log_(net_log), 18 net_log_(net_log),
19 delegate_(NULL) { 19 delegate_(NULL) {
20 } 20 }
21 21
22 QuicReliableClientStream::~QuicReliableClientStream() { 22 QuicReliableClientStream::~QuicReliableClientStream() {
23 if (delegate_) 23 if (delegate_)
24 delegate_->OnClose(connection_error()); 24 delegate_->OnClose(connection_error());
25 } 25 }
26 26
27 uint32 QuicReliableClientStream::ProcessData(const char* data, 27 uint32 QuicReliableClientStream::ProcessData(const char* data,
28 uint32 data_len) { 28 uint32 data_len) {
29 // TODO(rch): buffer data if we don't have a delegate. 29 // TODO(rch): buffer data if we don't have a delegate.
30 if (!delegate_) 30 if (!delegate_) {
31 return ERR_ABORTED; 31 DLOG(ERROR) << "Missing delegate";
32 Reset(QUIC_STREAM_CANCELLED);
33 return 0;
34 }
32 35
33 int rv = delegate_->OnDataReceived(data, data_len); 36 int rv = delegate_->OnDataReceived(data, data_len);
34 if (rv != OK) { 37 if (rv != OK) {
35 DLOG(ERROR) << "Delegate refused data, rv: " << rv; 38 DLOG(ERROR) << "Delegate refused data, rv: " << rv;
36 Reset(QUIC_BAD_APPLICATION_PAYLOAD); 39 Reset(QUIC_BAD_APPLICATION_PAYLOAD);
37 return 0; 40 return 0;
38 } 41 }
39 return data_len; 42 return data_len;
40 } 43 }
41 44
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 bool can_write = session()->connection()->CanWrite(HAS_RETRANSMITTABLE_DATA); 99 bool can_write = session()->connection()->CanWrite(HAS_RETRANSMITTABLE_DATA);
97 if (!can_write) { 100 if (!can_write) {
98 session()->MarkWriteBlocked(id(), EffectivePriority()); 101 session()->MarkWriteBlocked(id(), EffectivePriority());
99 DCHECK(callback_.is_null()); 102 DCHECK(callback_.is_null());
100 callback_ = callback; 103 callback_ = callback;
101 } 104 }
102 return can_write; 105 return can_write;
103 } 106 }
104 107
105 } // namespace net 108 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698