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

Unified Diff: net/quic/crypto/crypto_framer.cc

Issue 11191015: Revert 162259 - Add QuicFramer and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/crypto/crypto_framer.h ('k') | net/quic/crypto/crypto_framer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/crypto_framer.cc
===================================================================
--- net/quic/crypto/crypto_framer.cc (revision 162262)
+++ net/quic/crypto/crypto_framer.cc (working copy)
@@ -1,156 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "net/quic/crypto/crypto_framer.h"
-
-#include "net/quic/quic_data_reader.h"
-#include "net/quic/quic_data_writer.h"
-#include "net/quic/quic_protocol.h"
-
-using base::StringPiece;
-
-namespace net {
-
-CryptoFramer::CryptoFramer()
- : visitor_(NULL) {
- Clear();
-}
-
-CryptoFramer::~CryptoFramer() {}
-
-bool CryptoFramer::ProcessInput(StringPiece input) {
- DCHECK_EQ(QUIC_NO_ERROR, error_);
- if (error_ != QUIC_NO_ERROR) {
- return false;
- }
- // Add this data to the buffer.
- buffer_.append(input.data(), input.length());
- QuicDataReader reader(buffer_.data(), buffer_.length());
-
- switch (state_) {
- case STATE_READING_TAG:
- if (reader.BytesRemaining() < sizeof(uint32)) {
- break;
- }
- reader.ReadUInt32(&message_tag_);
- state_ = STATE_READING_NUM_ENTRIES;
- case STATE_READING_NUM_ENTRIES:
- if (reader.BytesRemaining() < sizeof(uint16)) {
- break;
- }
- reader.ReadUInt16(&num_entries_);
- if (num_entries_ > kMaxEntries) {
- error_ = QUIC_CRYPTO_TOO_MANY_ENTRIES;
- return false;
- }
- state_ = STATE_READING_KEY_TAGS;
- case STATE_READING_KEY_TAGS:
- if (reader.BytesRemaining() < num_entries_ * sizeof(uint32)) {
- break;
- }
- for (int i = 0; i < num_entries_; ++i) {
- CryptoTag tag;
- reader.ReadUInt32(&tag);
- if (i > 0 && tag <= tags_.back()) {
- error_ = QUIC_CRYPTO_TAGS_OUT_OF_ORDER;
- return false;
- }
- tags_.push_back(tag);
- }
- state_ = STATE_READING_LENGTHS;
- case STATE_READING_LENGTHS:
- if (reader.BytesRemaining() < num_entries_ * sizeof(uint16)) {
- break;
- }
- values_len_ = 0;
- for (int i = 0; i < num_entries_; ++i) {
- uint16 len;
- reader.ReadUInt16(&len);
- tag_length_map_[tags_[i]] = len;
- values_len_ += len;
- if (len == 0 && i != num_entries_ - 1) {
- error_ = QUIC_CRYPTO_INVALID_VALUE_LENGTH;
- return false;
- }
- }
- state_ = STATE_READING_VALUES;
- case STATE_READING_VALUES:
- if (reader.BytesRemaining() < values_len_) {
- break;
- }
- for (int i = 0; i < num_entries_; ++i) {
- StringPiece value;
- reader.ReadStringPiece(&value, tag_length_map_[tags_[i]]);
- tag_value_map_[tags_[i]] = value;
- }
- CryptoHandshakeMessage message;
- message.tag = message_tag_;
- message.tag_value_map.swap(tag_value_map_);
- visitor_->OnHandshakeMessage(message);
- Clear();
- state_ = STATE_READING_TAG;
- break;
- }
- // Save any left over data
- buffer_ = reader.PeekRemainingPayload().as_string();
- return true;
-}
-
-bool CryptoFramer::ConstructHandshakeMessage(
- const CryptoHandshakeMessage& message,
- QuicData** packet) {
- if (message.tag_value_map.size() > kMaxEntries) {
- return false;
- }
- size_t len = sizeof(uint32); // message tag
- len += sizeof(uint16); // number of map entries
- CryptoTagValueMap::const_iterator it = message.tag_value_map.begin();
- while (it != message.tag_value_map.end()) {
- len += sizeof(uint32); // tag
- len += sizeof(uint16); // value len
- len += it->second.length(); // value
- if (it->second.length() == 0) {
- return false;
- }
- ++it;
- }
- if (message.tag_value_map.size() % 2 == 1) {
- len += sizeof(uint16); // padding
- }
-
- QuicDataWriter writer(len);
- CHECK(writer.WriteUInt32(message.tag));
- CHECK(writer.WriteUInt16(message.tag_value_map.size()));
- // Tags
- for (it = message.tag_value_map.begin();
- it != message.tag_value_map.end(); ++it) {
- CHECK(writer.WriteUInt32(it->first));
- }
- // Lengths
- for (it = message.tag_value_map.begin();
- it != message.tag_value_map.end(); ++it) {
- CHECK(writer.WriteUInt16(it->second.length()));
- }
- // Possible padding
- if (message.tag_value_map.size() % 2 == 1) {
- CHECK(writer.WriteUInt16(0xABAB));
- }
- // Values
- for (it = message.tag_value_map.begin();
- it != message.tag_value_map.end(); ++it) {
- CHECK(writer.WriteBytes(it->second.data(), it->second.length()));
- }
- *packet = new QuicData(writer.take(), len, true);
- return true;
-}
-
-void CryptoFramer::Clear() {
- tag_value_map_.clear();
- tag_length_map_.clear();
- tags_.clear();
- error_ = QUIC_NO_ERROR;
- state_ = STATE_READING_TAG;
-}
-
-} // namespace net
« no previous file with comments | « net/quic/crypto/crypto_framer.h ('k') | net/quic/crypto/crypto_framer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698