diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 17:43:42 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 17:43:42 +0000 |
| commit | 977bd848c54ac0d8b7cd907d1f70cec19b01802d (patch) | |
| tree | b8ae9187cc7c3ac85f84baa1515a4dd02255c5e6 /net/tools | |
| parent | 87c98c91cf2b0fef672389068b0558d4cee70a33 (diff) | |
| download | chromium_src-977bd848c54ac0d8b7cd907d1f70cec19b01802d.zip chromium_src-977bd848c54ac0d8b7cd907d1f70cec19b01802d.tar.gz chromium_src-977bd848c54ac0d8b7cd907d1f70cec19b01802d.tar.bz2 | |
Add SpdyMajorVersion enum and use it everywhere
This is a bit more type-safe than just passing around ints.
Also add TODO for NPN->SpdyVersion conversion functions.
This lands server change 45485205.
R=rch@chromium.org
Review URL: https://codereview.chromium.org/14348010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/flip_server/spdy_interface.cc | 4 | ||||
| -rw-r--r-- | net/tools/quic/quic_spdy_client_stream.cc | 2 | ||||
| -rw-r--r-- | net/tools/quic/quic_spdy_server_stream.cc | 2 | ||||
| -rw-r--r-- | net/tools/quic/spdy_utils.cc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/net/tools/flip_server/spdy_interface.cc b/net/tools/flip_server/spdy_interface.cc index 649e99e..16023a5 100644 --- a/net/tools/flip_server/spdy_interface.cc +++ b/net/tools/flip_server/spdy_interface.cc @@ -40,7 +40,7 @@ SpdySM::SpdySM(SMConnection* connection, EpollServer* epoll_server, MemoryCache* memory_cache, FlipAcceptor* acceptor) - : buffered_spdy_framer_(new BufferedSpdyFramer(2, true)), + : buffered_spdy_framer_(new BufferedSpdyFramer(SPDY2, true)), valid_spdy_session_(false), connection_(connection), client_output_list_(connection->output_list()), @@ -297,7 +297,7 @@ void SpdySM::ResetForNewInterface(int32 server_idx) { void SpdySM::ResetForNewConnection() { // seq_num is not cleared, intentionally. delete buffered_spdy_framer_; - buffered_spdy_framer_ = new BufferedSpdyFramer(2, true); + buffered_spdy_framer_ = new BufferedSpdyFramer(SPDY2, true); buffered_spdy_framer_->set_visitor(this); valid_spdy_session_ = false; client_output_ordering_.Reset(); diff --git a/net/tools/quic/quic_spdy_client_stream.cc b/net/tools/quic/quic_spdy_client_stream.cc index 21c0d3c..6294953 100644 --- a/net/tools/quic/quic_spdy_client_stream.cc +++ b/net/tools/quic/quic_spdy_client_stream.cc @@ -78,7 +78,7 @@ ssize_t QuicSpdyClientStream::SendRequest(const BalsaHeaders& headers, int QuicSpdyClientStream::ParseResponseHeaders() { size_t read_buf_len = static_cast<size_t>(read_buf_->offset()); - SpdyFramer framer(3); + SpdyFramer framer(SPDY3); SpdyHeaderBlock headers; char* data = read_buf_->StartOfBuffer(); size_t len = framer.ParseHeaderBlockInBuffer(data, read_buf_->offset(), diff --git a/net/tools/quic/quic_spdy_server_stream.cc b/net/tools/quic/quic_spdy_server_stream.cc index ac537a8..d6f3b75 100644 --- a/net/tools/quic/quic_spdy_server_stream.cc +++ b/net/tools/quic/quic_spdy_server_stream.cc @@ -77,7 +77,7 @@ void QuicSpdyServerStream::SendHeaders( int QuicSpdyServerStream::ParseRequestHeaders() { size_t read_buf_len = static_cast<size_t>(read_buf_->offset()); - SpdyFramer framer(3); + SpdyFramer framer(SPDY3); SpdyHeaderBlock headers; char* data = read_buf_->StartOfBuffer(); size_t len = framer.ParseHeaderBlockInBuffer(data, read_buf_->offset(), diff --git a/net/tools/quic/spdy_utils.cc b/net/tools/quic/spdy_utils.cc index 6321f6d..8d3567c 100644 --- a/net/tools/quic/spdy_utils.cc +++ b/net/tools/quic/spdy_utils.cc @@ -157,9 +157,9 @@ string SpdyUtils::SerializeResponseHeaders( // static string SpdyUtils::SerializeUncompressedHeaders(const SpdyHeaderBlock& headers) { - int length = SpdyFramer::GetSerializedLength(kSpdyVersion3, &headers); + int length = SpdyFramer::GetSerializedLength(SPDY3, &headers); SpdyFrameBuilder builder(length); - SpdyFramer::WriteHeaderBlock(&builder, kSpdyVersion3, &headers); + SpdyFramer::WriteHeaderBlock(&builder, SPDY3, &headers); scoped_ptr<SpdyFrame> block(builder.take()); return string(block->data(), length); } |