lib/mvfst
1
0
Fork 0
mirror of https://github.com/facebookincubator/mvfst.git synced 2025-11-10 21:22:20 +03:00
Code Activity

Draft 24.

Browse Source 
Summary: There's no wire breaking changes, so we can up the version for interop.

Reviewed By: siyengar

Differential Revision: D18486643

fbshipit-source-id: 78d7ff9a0802f17927bcc19cecb375e9295d6708
This commit is contained in:
Matt Joras
2019-11-15 10:22:41 -08:00
committed by Facebook Github Bot
parent a5a0e96448
commit 6c45bb479a
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quic/QuicConstants.h
View File

@@ -184,7 +184,8 @@ enum class QuicVersion : uint32_t {
MVFST_OLD = 0xfaceb000, MVFST_OLD = 0xfaceb000,
MVFST = 0xfaceb001, MVFST = 0xfaceb001,
QUIC_DRAFT_22 = 0xFF000016, QUIC_DRAFT_22 = 0xFF000016,
QUIC_DRAFT = 0xFF000017, // Draft-23 QUIC_DRAFT_23 = 0xFF000017,
QUIC_DRAFT = 0xFF000018, // Draft-24
MVFST_INVALID = 0xfaceb00f, MVFST_INVALID = 0xfaceb00f,
}; };

2
quic/codec/Types.cpp
View File

@@ -463,6 +463,8 @@ std::string toString(QuicVersion version) {
return "MVFST"; return "MVFST";
case QuicVersion::QUIC_DRAFT_22: case QuicVersion::QUIC_DRAFT_22:
return "QUIC_DRAFT_22"; return "QUIC_DRAFT_22";
case QuicVersion::QUIC_DRAFT_23:
return "QUIC_DRAFT_23";
case QuicVersion::QUIC_DRAFT: case QuicVersion::QUIC_DRAFT:
return "QUIC_DRAFT"; return "QUIC_DRAFT";
case QuicVersion::MVFST_INVALID: case QuicVersion::MVFST_INVALID:

1
quic/handshake/FizzCryptoFactory.cpp
View File

@@ -101,6 +101,7 @@ Buf FizzCryptoFactory::makeInitialTrafficSecret(
case QuicVersion::QUIC_DRAFT_22: case QuicVersion::QUIC_DRAFT_22:
salt = kQuicDraft22Salt; salt = kQuicDraft22Salt;
break; break;
case QuicVersion::QUIC_DRAFT_23:
case QuicVersion::QUIC_DRAFT: case QuicVersion::QUIC_DRAFT:
salt = kQuicDraft23Salt; salt = kQuicDraft23Salt;
break; break;

6
quic/server/state/ServerStateMachine.h
View File

@@ -129,8 +129,10 @@ struct QuicServerConnectionState : public QuicConnectionStateBase {
// TODO: this is wrong, it should be the handshake finish time. But i need // TODO: this is wrong, it should be the handshake finish time. But i need
// a relatively sane time now to make the timestamps all sane. // a relatively sane time now to make the timestamps all sane.
connectionTime = Clock::now(); connectionTime = Clock::now();
supportedVersions = std::vector<QuicVersion>{ supportedVersions = std::vector<QuicVersion>{{QuicVersion::MVFST,
{QuicVersion::MVFST, QuicVersion::MVFST_OLD, QuicVersion::QUIC_DRAFT}}; QuicVersion::MVFST_OLD,
QuicVersion::QUIC_DRAFT,
QuicVersion::QUIC_DRAFT_23}};
originalVersion = QuicVersion::MVFST; originalVersion = QuicVersion::MVFST;
serverHandshakeLayer = new ServerHandshake(*cryptoState); serverHandshakeLayer = new ServerHandshake(*cryptoState);
handshakeLayer.reset(serverHandshakeLayer); handshakeLayer.reset(serverHandshakeLayer);