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/tools/quic/quic_spdy_client_stream.h" | 5 #include "net/tools/quic/quic_simple_client_stream.h" |
6 | 6 |
7 #include "net/http/http_response_info.h" | |
7 #include "net/spdy/spdy_framer.h" | 8 #include "net/spdy/spdy_framer.h" |
8 #include "net/tools/quic/quic_client_session.h" | 9 #include "net/spdy/spdy_http_utils.h" |
9 #include "net/tools/quic/spdy_utils.h" | 10 #include "net/tools/quic/quic_simple_client_session.h" |
10 | 11 |
11 using base::StringPiece; | 12 using base::StringPiece; |
12 using std::string; | 13 using std::string; |
13 | 14 |
14 namespace net { | 15 namespace net { |
15 namespace tools { | 16 namespace tools { |
16 | 17 |
17 static const size_t kHeaderBufInitialSize = 4096; | 18 static const size_t kHeaderBufInitialSize = 4096; |
18 | 19 |
19 QuicSpdyClientStream::QuicSpdyClientStream(QuicStreamId id, | 20 QuicSimpleClientStream::QuicSimpleClientStream(QuicStreamId id, |
20 QuicClientSession* session) | 21 QuicSimpleClientSession* session) |
21 : QuicDataStream(id, session), | 22 : QuicDataStream(id, session), |
22 read_buf_(new GrowableIOBuffer()), | 23 read_buf_(new GrowableIOBuffer()), |
23 response_headers_received_(false), | 24 response_headers_received_(false), |
24 header_bytes_read_(0), | 25 header_bytes_read_(0), |
25 header_bytes_written_(0) { | 26 header_bytes_written_(0) { |
27 read_buf_->SetCapacity(kHeaderBufInitialSize); | |
26 } | 28 } |
27 | 29 |
28 QuicSpdyClientStream::~QuicSpdyClientStream() { | 30 QuicSimpleClientStream::~QuicSimpleClientStream() { |
29 } | 31 } |
30 | 32 |
31 void QuicSpdyClientStream::OnStreamFrame(const QuicStreamFrame& frame) { | 33 void QuicSimpleClientStream::OnStreamFrame(const QuicStreamFrame& frame) { |
32 if (!write_side_closed()) { | 34 if (!write_side_closed()) { |
33 DVLOG(1) << "Got a response before the request was complete. " | 35 DVLOG(1) << "Got a response before the request was complete. " |
34 << "Aborting request."; | 36 << "Aborting request."; |
35 CloseWriteSide(); | 37 CloseWriteSide(); |
36 } | 38 } |
37 QuicDataStream::OnStreamFrame(frame); | 39 QuicDataStream::OnStreamFrame(frame); |
38 } | 40 } |
39 | 41 |
40 void QuicSpdyClientStream::OnStreamHeadersComplete(bool fin, | 42 void QuicSimpleClientStream::OnStreamHeadersComplete(bool fin, |
41 size_t frame_len) { | 43 size_t frame_len) { |
42 header_bytes_read_ = frame_len; | 44 header_bytes_read_ = frame_len; |
43 QuicDataStream::OnStreamHeadersComplete(fin, frame_len); | 45 QuicDataStream::OnStreamHeadersComplete(fin, frame_len); |
44 } | 46 } |
45 | 47 |
46 uint32 QuicSpdyClientStream::ProcessData(const char* data, | 48 uint32 QuicSimpleClientStream::ProcessData(const char* data, |
47 uint32 data_len) { | 49 uint32 data_len) { |
48 int total_bytes_processed = 0; | 50 int total_bytes_processed = 0; |
49 | 51 |
50 // Are we still reading the response headers. | 52 // Are we still reading the response headers. |
51 if (!response_headers_received_) { | 53 if (!response_headers_received_) { |
52 // Grow the read buffer if necessary. | 54 // Grow the read buffer if necessary. |
53 if (read_buf_->RemainingCapacity() < (int)data_len) { | 55 if (read_buf_->RemainingCapacity() < (int)data_len) { |
54 read_buf_->SetCapacity(read_buf_->capacity() + kHeaderBufInitialSize); | 56 read_buf_->SetCapacity(read_buf_->capacity() + kHeaderBufInitialSize); |
55 } | 57 } |
56 memcpy(read_buf_->data(), data, data_len); | 58 memcpy(read_buf_->data(), data, data_len); |
57 read_buf_->set_offset(read_buf_->offset() + data_len); | 59 read_buf_->set_offset(read_buf_->offset() + data_len); |
58 ParseResponseHeaders(); | 60 ParseResponseHeaders(); |
59 } else { | 61 } else { |
60 data_.append(data + total_bytes_processed, | 62 data_.append(data + total_bytes_processed, |
61 data_len - total_bytes_processed); | 63 data_len - total_bytes_processed); |
62 } | 64 } |
63 return data_len; | 65 return data_len; |
64 } | 66 } |
65 | 67 |
66 void QuicSpdyClientStream::OnFinRead() { | 68 void QuicSimpleClientStream::OnFinRead() { |
67 ReliableQuicStream::OnFinRead(); | 69 ReliableQuicStream::OnFinRead(); |
68 if (!response_headers_received_) { | 70 if (!response_headers_received_) { |
69 Reset(QUIC_BAD_APPLICATION_PAYLOAD); | 71 Reset(QUIC_BAD_APPLICATION_PAYLOAD); |
70 } else if ((headers().content_length_status() == | 72 } else if (headers()->GetContentLength() != -1 && |
71 BalsaHeadersEnums::VALID_CONTENT_LENGTH) && | 73 data_.size() != |
72 data_.size() != headers().content_length()) { | 74 static_cast<size_t>(headers()->GetContentLength())) { |
73 Reset(QUIC_BAD_APPLICATION_PAYLOAD); | 75 Reset(QUIC_BAD_APPLICATION_PAYLOAD); |
74 } | 76 } |
75 } | 77 } |
76 | 78 |
77 ssize_t QuicSpdyClientStream::SendRequest(const BalsaHeaders& headers, | 79 ssize_t QuicSimpleClientStream::SendRequest(const HttpRequestInfo& request, |
78 StringPiece body, | 80 StringPiece body, |
79 bool fin) { | 81 bool fin) { |
80 SpdyHeaderBlock header_block = | 82 SpdyHeaderBlock header_block; |
81 SpdyUtils::RequestHeadersToSpdyHeaders(headers); | 83 CreateSpdyHeadersFromHttpRequest(request, |
84 request.extra_headers, | |
85 SPDY3, | |
86 /*direct=*/ true, | |
87 &header_block); | |
82 | 88 |
83 bool send_fin_with_headers = fin && body.empty(); | 89 bool send_fin_with_headers = fin && body.empty(); |
84 size_t bytes_sent = body.size(); | 90 size_t bytes_sent = body.size(); |
85 header_bytes_written_ = | 91 header_bytes_written_ = |
86 WriteHeaders(header_block, send_fin_with_headers, nullptr); | 92 WriteHeaders(header_block, send_fin_with_headers, nullptr); |
87 bytes_sent += header_bytes_written_; | 93 bytes_sent += header_bytes_written_; |
88 | 94 |
89 if (!body.empty()) { | 95 if (!body.empty()) { |
90 WriteOrBufferData(body, fin, nullptr); | 96 WriteOrBufferData(body, fin, nullptr); |
91 } | 97 } |
92 | 98 |
93 return bytes_sent; | 99 return bytes_sent; |
94 } | 100 } |
95 | 101 |
96 int QuicSpdyClientStream::ParseResponseHeaders() { | 102 int QuicSimpleClientStream::ParseResponseHeaders() { |
97 size_t read_buf_len = static_cast<size_t>(read_buf_->offset()); | 103 size_t read_buf_len = static_cast<size_t>(read_buf_->offset()); |
98 SpdyFramer framer(SPDY3); | 104 SpdyFramer framer(SPDY3); |
99 SpdyHeaderBlock headers; | 105 SpdyHeaderBlock headers; |
100 char* data = read_buf_->StartOfBuffer(); | 106 char* data = read_buf_->StartOfBuffer(); |
101 size_t len = framer.ParseHeaderBlockInBuffer(data, read_buf_->offset(), | 107 size_t len = framer.ParseHeaderBlockInBuffer(data, read_buf_len, &headers); |
ramant (doing other things)
2015/03/18 05:21:36
nit: Not sure. Could read_buf_->offset() change af
Ryan Hamilton
2015/03/18 22:35:57
I don't think it matter, but happy to do what we'r
| |
102 &headers); | |
103 if (len == 0) { | 108 if (len == 0) { |
104 return -1; | 109 return -1; |
105 } | 110 } |
106 | 111 |
107 if (!SpdyUtils::FillBalsaResponseHeaders(headers, &headers_)) { | 112 HttpResponseInfo info; |
113 if (!SpdyHeadersToHttpResponse(headers, SPDY3, &info)) { | |
108 Reset(QUIC_BAD_APPLICATION_PAYLOAD); | 114 Reset(QUIC_BAD_APPLICATION_PAYLOAD); |
109 return -1; | 115 return -1; |
110 } | 116 } |
117 headers_ = info.headers; | |
118 | |
111 response_headers_received_ = true; | 119 response_headers_received_ = true; |
112 | 120 |
113 size_t delta = read_buf_len - len; | 121 size_t delta = read_buf_len - len; |
114 if (delta > 0) { | 122 if (delta > 0) { |
115 data_.append(data + len, delta); | 123 data_.append(data + len, delta); |
116 } | 124 } |
117 | 125 |
118 return len; | 126 return len; |
119 } | 127 } |
120 | 128 |
121 void QuicSpdyClientStream::SendBody(const string& data, bool fin) { | 129 void QuicSimpleClientStream::SendBody(const string& data, bool fin) { |
122 SendBody(data, fin, nullptr); | 130 SendBody(data, fin, nullptr); |
123 } | 131 } |
124 | 132 |
125 void QuicSpdyClientStream::SendBody( | 133 void QuicSimpleClientStream::SendBody( |
126 const string& data, | 134 const string& data, |
127 bool fin, | 135 bool fin, |
128 QuicAckNotifier::DelegateInterface* delegate) { | 136 QuicAckNotifier::DelegateInterface* delegate) { |
129 WriteOrBufferData(data, fin, delegate); | 137 WriteOrBufferData(data, fin, delegate); |
130 } | 138 } |
131 | 139 |
132 } // namespace tools | 140 } // namespace tools |
133 } // namespace net | 141 } // namespace net |
OLD | NEW |