add WindowUpdate frame parsing

This commit is contained in:
Marten Seemann
2016-04-22 19:52:33 +07:00
parent ed244e95a6
commit a9c00a4303
5 changed files with 82 additions and 6 deletions

View File

@@ -0,0 +1,48 @@
package frames
import (
"bytes"
"github.com/lucas-clemente/quic-go/protocol"
"github.com/lucas-clemente/quic-go/utils"
)
// A WindowUpdateFrame in QUIC
type WindowUpdateFrame struct {
StreamID protocol.StreamID
ByteOffset uint64
}
//Write writes a RST_STREAM frame
func (f *WindowUpdateFrame) Write(b *bytes.Buffer) error {
panic("WindowUpdateFrame: Write not yet implemented")
}
// MaxLength of a written frame
func (f *WindowUpdateFrame) MaxLength() int {
panic("WindowUpdateFrame: Write not yet implemented")
}
// ParseWindowUpdateFrame parses a RST_STREAM frame
func ParseWindowUpdateFrame(r *bytes.Reader) (*WindowUpdateFrame, error) {
frame := &WindowUpdateFrame{}
// read the TypeByte
_, err := r.ReadByte()
if err != nil {
return nil, err
}
sid, err := utils.ReadUint32(r)
if err != nil {
return nil, err
}
frame.StreamID = protocol.StreamID(sid)
frame.ByteOffset, err = utils.ReadUint64(r)
if err != nil {
return nil, err
}
return frame, nil
}

View File

@@ -0,0 +1,24 @@
package frames
import (
"bytes"
"github.com/lucas-clemente/quic-go/protocol"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
var _ = Describe("WindowUpdateFrame", func() {
Context("window update frames", func() {
Context("when parsing", func() {
It("accepts sample frame", func() {
b := bytes.NewReader([]byte{0x04, 0xEF, 0xBE, 0xAD, 0xDE, 0x44, 0x33, 0x22, 0x11, 0xAD, 0xFB, 0xCA, 0xDE})
frame, err := ParseWindowUpdateFrame(b)
Expect(err).ToNot(HaveOccurred())
Expect(frame.StreamID).To(Equal(protocol.StreamID(0xDEADBEEF)))
Expect(frame.ByteOffset).To(Equal(uint64(0xDECAFBAD11223344)))
Expect(b.Len()).To(Equal(0))
})
})
})
})

View File

@@ -61,10 +61,7 @@ ReadLoop:
case 0x03:
err = errors.New("unimplemented: GOAWAY")
case 0x04:
fmt.Println("unimplemented: WINDOW_UPDATE")
p := make([]byte, 1+4+8)
_, err = r.Read(p)
frame = nil
frame, err = frames.ParseWindowUpdateFrame(r)
case 0x05:
fmt.Println("unimplemented: BLOCKED")
p := make([]byte, 1+4)

View File

@@ -126,10 +126,15 @@ var _ = Describe("Packet unpacker", func() {
})
It("accepts WINDOW_UPDATE frames", func() {
setReader([]byte{0x04, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})
setReader([]byte{0x04, 0xEF, 0xBE, 0xAD, 0xDE, 0x37, 0x13, 0, 0, 0, 0, 0xFE, 0xCA})
packet, err := unpacker.Unpack(hdrBin, hdr, r)
Expect(err).ToNot(HaveOccurred())
Expect(packet.frames).To(HaveLen(0))
Expect(packet.frames).To(Equal([]frames.Frame{
&frames.WindowUpdateFrame{
StreamID: 0xDEADBEEF,
ByteOffset: 0xCAFE000000001337,
},
}))
})
It("accepts BLOCKED frames", func() {

View File

@@ -86,6 +86,8 @@ func (s *Session) HandlePacket(addr *net.UDPAddr, publicHeaderBinary []byte, pub
fmt.Printf("%#v\n", frame)
case *frames.RstStreamFrame:
fmt.Printf("%#v\n", frame)
case *frames.WindowUpdateFrame:
fmt.Printf("%#v\n", frame)
default:
panic("unexpected frame type")
}