summaryrefslogtreecommitdiffstats
path: root/net/quic/crypto/crypto_protocol.h
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 08:26:14 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 08:26:14 +0000
commitccc66e8acadcd816e3f9ca19ce34a64bcb83a48d (patch)
tree0dd228a4fb3666bd5b5d4400594bb4c1ebe0b20c /net/quic/crypto/crypto_protocol.h
parente8e49bf53386d069ea5097370f881c41a0d703f7 (diff)
downloadchromium_src-ccc66e8acadcd816e3f9ca19ce34a64bcb83a48d.zip
chromium_src-ccc66e8acadcd816e3f9ca19ce34a64bcb83a48d.tar.gz
chromium_src-ccc66e8acadcd816e3f9ca19ce34a64bcb83a48d.tar.bz2
Land Recent QUIC Changes
Removed the tab characters. Fixed review comments from rch. R=rch@chromium.org QUIC - pending changelist - Use static for congestion manager constants. Merger internal change: 43867480 R=rch@chromium.org QUIC - cleanup of stats Merge internal change: 43864412 R=rch@chromium.org QUIC - Add two new methods to QuicConnectionHelper to abstarct away differences between server and chromium. Merge internal change: 43850438 R=rch@chromium.org QUIC - Start tracking number of rejected connections and connection close. Merge internal change: 43846131 R=rch@chromium.org QUIC - Temporary work around for bug with server tests. Merge internal change: 43845688 R=rch@chromium.org QUIC - Bugfix; don't queue ConnectionClosePackets and don't process incoming packets if the connection is closed. Merge internal change: 43813759 R=rch@chromium.org QUIC - More cleanups Merge internal change: 43805954 R=rch@chromium.org QUIC Crypto - Change CryptoHandshakeMessage to a class. Merge internal change: 43798895 R=rch@chromium.org, wtc@chromium.org QUIC crypto: cleanup between steps 4 and 5. Merge internal change: 43791096 R=rch@chromium.org, agl@chromium.org QUIC crypto: steps 3 and 4 from the plan. Merge internal change: 43787806 R=rch@chromium.org, agl@chromium.org QUIC - Improved sendalarm accuracy Merge internal change: 43785455 R=rch@chromium.org Review URL: https://chromiumcodereview.appspot.com/12863007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/crypto/crypto_protocol.h')
-rw-r--r--net/quic/crypto/crypto_protocol.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/quic/crypto/crypto_protocol.h b/net/quic/crypto/crypto_protocol.h
index 010b1d0..0b84a98 100644
--- a/net/quic/crypto/crypto_protocol.h
+++ b/net/quic/crypto/crypto_protocol.h
@@ -25,7 +25,7 @@ typedef std::vector<CryptoTag> CryptoTagVector;
const CryptoTag kCHLO = MAKE_TAG('C', 'H', 'L', 'O'); // Client hello
const CryptoTag kSHLO = MAKE_TAG('S', 'H', 'L', 'O'); // Server hello
-const CryptoTag kSCFG = MAKE_TAG('S', 'H', 'L', 'O'); // Server config
+const CryptoTag kSCFG = MAKE_TAG('S', 'C', 'F', 'G'); // Server config
const CryptoTag kREJ = MAKE_TAG('R', 'E', 'J', '\0'); // Reject
// Key exchange methods
@@ -56,6 +56,7 @@ const CryptoTag kSNI = MAKE_TAG('S', 'N', 'I', '\0'); // Server name
// indication
const CryptoTag kPUBS = MAKE_TAG('P', 'U', 'B', 'S'); // Public key values
const CryptoTag kSCID = MAKE_TAG('S', 'C', 'I', 'D'); // Server config id
+const CryptoTag kSRCT = MAKE_TAG('S', 'R', 'C', 'T'); // Source-address token
const size_t kMaxEntries = 16; // Max number of entries in a message.