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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/hpack_encoding_context.cc

Issue 145353017: Update HPACK implementation to draft 05 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/spdy/hpack_encoding_context.h ('k') | net/spdy/hpack_encoding_context_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/hpack_encoding_context.cc
diff --git a/net/spdy/hpack_encoding_context.cc b/net/spdy/hpack_encoding_context.cc
index 007f3261dd10a55a7daac664678258b62fa09f6d..c3950644142ad0f8ef70f69d24afcf439b59430e 100644
--- a/net/spdy/hpack_encoding_context.cc
+++ b/net/spdy/hpack_encoding_context.cc
@@ -12,6 +12,8 @@
namespace net {
+using base::StringPiece;
+
namespace {
// An entry in the static table. Must be a POD in order to avoid
@@ -30,65 +32,66 @@ struct StaticEntry {
{ name, arraysize(name) - 1, value, arraysize(value) - 1 }
const StaticEntry kStaticTable[] = {
- STATIC_ENTRY(":authority" , ""), // 0
- STATIC_ENTRY(":method" , "GET"), // 1
- STATIC_ENTRY(":method" , "POST"), // 2
- STATIC_ENTRY(":path" , "/"), // 3
- STATIC_ENTRY(":path" , "/index.html"), // 4
- STATIC_ENTRY(":scheme" , "http"), // 5
- STATIC_ENTRY(":scheme" , "https"), // 6
- STATIC_ENTRY(":status" , "200"), // 7
- STATIC_ENTRY(":status" , "500"), // 8
- STATIC_ENTRY(":status" , "404"), // 9
- STATIC_ENTRY(":status" , "403"), // 10
- STATIC_ENTRY(":status" , "400"), // 11
- STATIC_ENTRY(":status" , "401"), // 12
- STATIC_ENTRY("accept-charset" , ""), // 13
- STATIC_ENTRY("accept-encoding" , ""), // 14
- STATIC_ENTRY("accept-language" , ""), // 15
- STATIC_ENTRY("accept-ranges" , ""), // 16
- STATIC_ENTRY("accept" , ""), // 17
- STATIC_ENTRY("access-control-allow-origin" , ""), // 18
- STATIC_ENTRY("age" , ""), // 19
- STATIC_ENTRY("allow" , ""), // 20
- STATIC_ENTRY("authorization" , ""), // 21
- STATIC_ENTRY("cache-control" , ""), // 22
- STATIC_ENTRY("content-disposition" , ""), // 23
- STATIC_ENTRY("content-encoding" , ""), // 24
- STATIC_ENTRY("content-language" , ""), // 25
- STATIC_ENTRY("content-length" , ""), // 26
- STATIC_ENTRY("content-location" , ""), // 27
- STATIC_ENTRY("content-range" , ""), // 28
- STATIC_ENTRY("content-type" , ""), // 29
- STATIC_ENTRY("cookie" , ""), // 30
- STATIC_ENTRY("date" , ""), // 31
- STATIC_ENTRY("etag" , ""), // 32
- STATIC_ENTRY("expect" , ""), // 33
- STATIC_ENTRY("expires" , ""), // 34
- STATIC_ENTRY("from" , ""), // 35
- STATIC_ENTRY("if-match" , ""), // 36
- STATIC_ENTRY("if-modified-since" , ""), // 37
- STATIC_ENTRY("if-none-match" , ""), // 38
- STATIC_ENTRY("if-range" , ""), // 39
- STATIC_ENTRY("if-unmodified-since" , ""), // 40
- STATIC_ENTRY("last-modified" , ""), // 41
- STATIC_ENTRY("link" , ""), // 42
- STATIC_ENTRY("location" , ""), // 43
- STATIC_ENTRY("max-forwards" , ""), // 44
- STATIC_ENTRY("proxy-authenticate" , ""), // 45
- STATIC_ENTRY("proxy-authorization" , ""), // 46
- STATIC_ENTRY("range" , ""), // 47
- STATIC_ENTRY("referer" , ""), // 48
- STATIC_ENTRY("refresh" , ""), // 49
- STATIC_ENTRY("retry-after" , ""), // 50
- STATIC_ENTRY("server" , ""), // 51
- STATIC_ENTRY("set-cookie" , ""), // 52
- STATIC_ENTRY("strict-transport-security" , ""), // 53
- STATIC_ENTRY("transfer-encoding" , ""), // 54
- STATIC_ENTRY("user-agent" , ""), // 55
- STATIC_ENTRY("vary" , ""), // 56
- STATIC_ENTRY("via" , ""), // 57
- STATIC_ENTRY("www-authenticate" , ""), // 58
+ STATIC_ENTRY(":authority" , ""), // 1
+ STATIC_ENTRY(":method" , "GET"), // 2
+ STATIC_ENTRY(":method" , "POST"), // 3
+ STATIC_ENTRY(":path" , "/"), // 4
+ STATIC_ENTRY(":path" , "/index.html"), // 5
+ STATIC_ENTRY(":scheme" , "http"), // 6
+ STATIC_ENTRY(":scheme" , "https"), // 7
+ STATIC_ENTRY(":status" , "200"), // 8
+ STATIC_ENTRY(":status" , "500"), // 9
+ STATIC_ENTRY(":status" , "404"), // 10
+ STATIC_ENTRY(":status" , "403"), // 11
+ STATIC_ENTRY(":status" , "400"), // 12
+ STATIC_ENTRY(":status" , "401"), // 13
+ STATIC_ENTRY("accept-charset" , ""), // 14
+ STATIC_ENTRY("accept-encoding" , ""), // 15
+ STATIC_ENTRY("accept-language" , ""), // 16
+ STATIC_ENTRY("accept-ranges" , ""), // 17
+ STATIC_ENTRY("accept" , ""), // 18
+ STATIC_ENTRY("access-control-allow-origin" , ""), // 19
+ STATIC_ENTRY("age" , ""), // 20
+ STATIC_ENTRY("allow" , ""), // 21
+ STATIC_ENTRY("authorization" , ""), // 22
+ STATIC_ENTRY("cache-control" , ""), // 23
+ STATIC_ENTRY("content-disposition" , ""), // 24
+ STATIC_ENTRY("content-encoding" , ""), // 25
+ STATIC_ENTRY("content-language" , ""), // 26
+ STATIC_ENTRY("content-length" , ""), // 27
+ STATIC_ENTRY("content-location" , ""), // 28
+ STATIC_ENTRY("content-range" , ""), // 29
+ STATIC_ENTRY("content-type" , ""), // 30
+ STATIC_ENTRY("cookie" , ""), // 31
+ STATIC_ENTRY("date" , ""), // 32
+ STATIC_ENTRY("etag" , ""), // 33
+ STATIC_ENTRY("expect" , ""), // 34
+ STATIC_ENTRY("expires" , ""), // 35
+ STATIC_ENTRY("from" , ""), // 36
+ STATIC_ENTRY("host" , ""), // 37
+ STATIC_ENTRY("if-match" , ""), // 38
+ STATIC_ENTRY("if-modified-since" , ""), // 39
+ STATIC_ENTRY("if-none-match" , ""), // 40
+ STATIC_ENTRY("if-range" , ""), // 41
+ STATIC_ENTRY("if-unmodified-since" , ""), // 42
+ STATIC_ENTRY("last-modified" , ""), // 43
+ STATIC_ENTRY("link" , ""), // 44
+ STATIC_ENTRY("location" , ""), // 45
+ STATIC_ENTRY("max-forwards" , ""), // 46
+ STATIC_ENTRY("proxy-authenticate" , ""), // 47
+ STATIC_ENTRY("proxy-authorization" , ""), // 48
+ STATIC_ENTRY("range" , ""), // 49
+ STATIC_ENTRY("referer" , ""), // 50
+ STATIC_ENTRY("refresh" , ""), // 51
+ STATIC_ENTRY("retry-after" , ""), // 52
+ STATIC_ENTRY("server" , ""), // 53
+ STATIC_ENTRY("set-cookie" , ""), // 54
+ STATIC_ENTRY("strict-transport-security" , ""), // 55
+ STATIC_ENTRY("transfer-encoding" , ""), // 56
+ STATIC_ENTRY("user-agent" , ""), // 57
+ STATIC_ENTRY("vary" , ""), // 58
+ STATIC_ENTRY("via" , ""), // 59
+ STATIC_ENTRY("www-authenticate" , ""), // 60
};
#undef STATIC_ENTRY
@@ -103,40 +106,48 @@ HpackEncodingContext::HpackEncodingContext() {}
HpackEncodingContext::~HpackEncodingContext() {}
+uint32 HpackEncodingContext::GetMutableEntryCount() const {
+ return header_table_.GetEntryCount();
+}
+
uint32 HpackEncodingContext::GetEntryCount() const {
- return header_table_.GetEntryCount() + kStaticEntryCount;
+ return GetMutableEntryCount() + kStaticEntryCount;
}
-base::StringPiece HpackEncodingContext::GetNameAt(uint32 index) const {
- CHECK_LT(index, GetEntryCount());
- if (index >= header_table_.GetEntryCount()) {
+StringPiece HpackEncodingContext::GetNameAt(uint32 index) const {
+ CHECK_GE(index, 1u);
+ CHECK_LE(index, GetEntryCount());
+ if (index > header_table_.GetEntryCount()) {
const StaticEntry& entry =
- kStaticTable[index - header_table_.GetEntryCount()];
- return base::StringPiece(entry.name, entry.name_len);
+ kStaticTable[index - header_table_.GetEntryCount() - 1];
+ return StringPiece(entry.name, entry.name_len);
}
return header_table_.GetEntry(index).name();
}
-base::StringPiece HpackEncodingContext::GetValueAt(uint32 index) const {
- CHECK_LT(index, GetEntryCount());
- if (index >= header_table_.GetEntryCount()) {
+StringPiece HpackEncodingContext::GetValueAt(uint32 index) const {
+ CHECK_GE(index, 1u);
+ CHECK_LE(index, GetEntryCount());
+ if (index > header_table_.GetEntryCount()) {
const StaticEntry& entry =
- kStaticTable[index - header_table_.GetEntryCount()];
- return base::StringPiece(entry.value, entry.value_len);
+ kStaticTable[index - header_table_.GetEntryCount() - 1];
+ return StringPiece(entry.value, entry.value_len);
}
return header_table_.GetEntry(index).value();
}
bool HpackEncodingContext::IsReferencedAt(uint32 index) const {
- CHECK_LT(index, GetEntryCount());
- if (index >= header_table_.GetEntryCount())
+ CHECK_GE(index, 1u);
+ CHECK_LE(index, GetEntryCount());
+ if (index > header_table_.GetEntryCount())
return false;
return header_table_.GetEntry(index).IsReferenced();
}
uint32 HpackEncodingContext::GetTouchCountAt(uint32 index) const {
- CHECK_LT(index, GetEntryCount());
- if (index >= header_table_.GetEntryCount())
+ CHECK_GE(index, 1u);
+ CHECK_LE(index, GetEntryCount());
+ if (index > header_table_.GetEntryCount())
return 0;
return header_table_.GetEntry(index).TouchCount();
}
@@ -159,12 +170,12 @@ void HpackEncodingContext::SetMaxSize(uint32 max_size) {
bool HpackEncodingContext::ProcessIndexedHeader(
uint32 index,
- int32* new_index,
+ uint32* new_index,
std::vector<uint32>* removed_referenced_indices) {
- if (index >= GetEntryCount())
+ if (index < 1 || index > GetEntryCount())
return false;
- if (index < header_table_.GetEntryCount()) {
+ if (index <= header_table_.GetEntryCount()) {
*new_index = index;
removed_referenced_indices->clear();
HpackEntry* entry = header_table_.GetMutableEntry(index);
@@ -175,7 +186,7 @@ bool HpackEncodingContext::ProcessIndexedHeader(
HpackEntry entry(GetNameAt(index), GetValueAt(index));
header_table_.TryAddEntry(entry, new_index, removed_referenced_indices);
- if (*new_index >= 0) {
+ if (*new_index >= 1) {
header_table_.GetMutableEntry(*new_index)->SetReferenced(true);
}
}
@@ -183,13 +194,13 @@ bool HpackEncodingContext::ProcessIndexedHeader(
}
bool HpackEncodingContext::ProcessLiteralHeaderWithIncrementalIndexing(
- base::StringPiece name,
- base::StringPiece value,
- int32* index,
+ StringPiece name,
+ StringPiece value,
+ uint32* index,
std::vector<uint32>* removed_referenced_indices) {
HpackEntry entry(name, value);
header_table_.TryAddEntry(entry, index, removed_referenced_indices);
- if (*index >= 0) {
+ if (*index >= 1) {
header_table_.GetMutableEntry(*index)->SetReferenced(true);
}
return true;
« no previous file with comments | « net/spdy/hpack_encoding_context.h ('k') | net/spdy/hpack_encoding_context_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698