gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

accept NACKs, WINDOW_UPDATEs and BLOCKEDs, but don't handle them yet

Browse Source
This commit is contained in:
Lucas Clemente
2016-04-18 21:07:00 +02:00
parent 1fb937e7ef
commit 673f91ee63
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
frames/ack_frame.go
View File

@@ -2,6 +2,7 @@ package frames
import ( import (
"bytes" "bytes"
"fmt"
"github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/protocol"
"github.com/lucas-clemente/quic-go/utils" "github.com/lucas-clemente/quic-go/utils"
@@ -36,8 +37,9 @@ func ParseAckFrame(r *bytes.Reader) (*AckFrame, error) {
return nil, err return nil, err
} }
hasNACK := false
if typeByte&0x20 == 0x20 { if typeByte&0x20 == 0x20 {
panic("NACK ranges not yet implemented.") hasNACK = true
} }
if typeByte&0x10 == 0x10 { if typeByte&0x10 == 0x10 {
panic("truncated ACKs not yet implemented.") panic("truncated ACKs not yet implemented.")
@@ -94,11 +96,27 @@ func ParseAckFrame(r *bytes.Reader) (*AckFrame, error) {
return nil, err return nil, err
} }
// Time Since Previous Timestamp // Time Since Previous Timestamp
_, err := utils.ReadUint16(r) _, err = utils.ReadUint16(r)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
if hasNACK {
fmt.Println("NACK not implemented yet!")
var numRanges uint8
numRanges, err = r.ReadByte()
if err != nil {
return nil, err
}
p := make([]byte, largestObservedLen+1)
for i := uint8(0); i < numRanges; i++ {
_, err := r.Read(p)
if err != nil {
return nil, err
}
}
}
return frame, nil return frame, nil
} }

14
session.go
View File

@@ -105,9 +105,9 @@ func (s *Session) HandlePacket(addr *net.UDPAddr, publicHeaderBinary []byte, pub
err = nil err = nil
if typeByte&0x80 == 0x80 { if typeByte&0x80 == 0x80 {
err = s.handleStreamFrame(r) err = s.handleStreamFrame(r)
} else if typeByte == 0x40 { } else if typeByte&0xca == 0x40 {
err = s.handleAckFrame(r) err = s.handleAckFrame(r)
} else if typeByte&0xE0 == 0x20 { } else if typeByte&0xe0 == 0x20 {
err = errors.New("unimplemented: CONGESTION_FEEDBACK") err = errors.New("unimplemented: CONGESTION_FEEDBACK")
} else { } else {
switch typeByte { switch typeByte {
@@ -120,9 +120,15 @@ func (s *Session) HandlePacket(addr *net.UDPAddr, publicHeaderBinary []byte, pub
case 0x03: case 0x03:
err = errors.New("unimplemented: GOAWAY") err = errors.New("unimplemented: GOAWAY")
case 0x04: case 0x04:
err = errors.New("unimplemented: WINDOW_UPDATE") // err = errors.New("unimplemented: WINDOW_UPDATE")
fmt.Println("unimplemented: WINDOW_UPDATE")
p := make([]byte, 1+4+8)
_, err = r.Read(p)
case 0x05: case 0x05:
err = errors.New("unimplemented: BLOCKED") // err = errors.New("unimplemented: BLOCKED")
fmt.Println("unimplemented: BLOCKED")
p := make([]byte, 1+4)
_, err = r.Read(p)
case 0x06: case 0x06:
err = s.handleStopWaitingFrame(r, publicHeader) err = s.handleStopWaitingFrame(r, publicHeader)
case 0x07: case 0x07: