renumber frame types

This commit is contained in:
Marten Seemann
2018-11-10 09:21:19 +07:00
parent 9065ec3410
commit 59ab139720
32 changed files with 178 additions and 184 deletions

View File

@@ -26,43 +26,45 @@ func ParseNextFrame(r *bytes.Reader, v protocol.VersionNumber) (Frame, error) {
func parseFrame(r *bytes.Reader, typeByte byte, v protocol.VersionNumber) (Frame, error) {
var frame Frame
var err error
if typeByte&0xf8 == 0x10 {
if typeByte&0xf8 == 0x8 {
frame, err = parseStreamFrame(r, v)
if err != nil {
return nil, qerr.Error(qerr.InvalidFrameData, err.Error())
}
return frame, nil
}
// TODO: implement all IETF QUIC frame types
switch typeByte {
case 0x1:
frame, err = parseResetStreamFrame(r, v)
case 0x2, 0x3:
frame, err = parseConnectionCloseFrame(r, v)
case 0x4:
frame, err = parseMaxDataFrame(r, v)
case 0x5:
frame, err = parseMaxStreamDataFrame(r, v)
case 0x7:
frame, err = parsePingFrame(r, v)
case 0x8:
frame, err = parseDataBlockedFrame(r, v)
case 0x9:
frame, err = parseStreamDataBlockedFrame(r, v)
case 0xa, 0xb:
frame, err = parseStreamsBlockedFrame(r, v)
case 0xc:
frame, err = parseStopSendingFrame(r, v)
case 0xe:
frame, err = parsePathChallengeFrame(r, v)
case 0xf:
frame, err = parsePathResponseFrame(r, v)
case 0x1a, 0x1b:
case 0x2, 0x3:
frame, err = parseAckFrame(r, v)
case 0x1c, 0x1d:
frame, err = parseMaxStreamsFrame(r, v)
case 0x18:
case 0x4:
frame, err = parseResetStreamFrame(r, v)
case 0x5:
frame, err = parseStopSendingFrame(r, v)
case 0x6:
frame, err = parseCryptoFrame(r, v)
// TODO: implement the NEW_TOKEN frame
case 0x10:
frame, err = parseMaxDataFrame(r, v)
case 0x11:
frame, err = parseMaxStreamDataFrame(r, v)
case 0x12, 0x13:
frame, err = parseMaxStreamsFrame(r, v)
case 0x14:
frame, err = parseDataBlockedFrame(r, v)
case 0x15:
frame, err = parseStreamDataBlockedFrame(r, v)
case 0x16, 0x17:
frame, err = parseStreamsBlockedFrame(r, v)
// TODO: implement NEW_CONNECTION_ID frame
// TODO: implement RETIRE_CONNECTION_ID frame
case 0x1a:
frame, err = parsePathChallengeFrame(r, v)
case 0x1b:
frame, err = parsePathResponseFrame(r, v)
case 0x1c, 0x1d:
frame, err = parseConnectionCloseFrame(r, v)
default:
err = fmt.Errorf("unknown type byte 0x%x", typeByte)
}