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

rename {New,GetOrCreate}Stream stream to {,GetOr}OpenStream

Browse Source
This commit is contained in:
Lucas Clemente
2016-05-15 18:51:23 +02:00
parent af522c1538
commit d469a19b62
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
h2quic/server.go
View File

@@ -15,7 +15,7 @@ import (
)
type streamCreator interface {
GetOrCreateStream(protocol.StreamID) (utils.Stream, error)
GetOrOpenStream(protocol.StreamID) (utils.Stream, error)
Close(error, bool) error
}
@@ -94,7 +94,7 @@ func (s *Server) handleRequest(session streamCreator, headerStream utils.Stream,
}
utils.Infof("%s %s%s", req.Method, req.Host, req.RequestURI)
dataStream, err := session.GetOrCreateStream(protocol.StreamID(h2headersFrame.StreamID))
dataStream, err := session.GetOrOpenStream(protocol.StreamID(h2headersFrame.StreamID))
if err != nil {
return err
}

2
h2quic/server_test.go
View File

@@ -18,7 +18,7 @@ type mockSession struct {
closed bool
}
func (s *mockSession) GetOrCreateStream(id protocol.StreamID) (utils.Stream, error) {
func (s *mockSession) GetOrOpenStream(id protocol.StreamID) (utils.Stream, error) {
return &mockStream{}, nil
}

12
session.go
View File

@@ -97,7 +97,7 @@ func newSession(conn connection, v protocol.VersionNumber, connectionID protocol
aeadChanged: make(chan struct{}, 1),
}
cryptoStream, _ := session.NewStream(1)
cryptoStream, _ := session.OpenStream(1)
cryptoSetup := handshake.NewCryptoSetup(connectionID, v, sCfg, cryptoStream, session.connectionParametersManager, session.aeadChanged)
go func() {
@@ -255,7 +255,7 @@ func (s *Session) handleStreamFrame(frame *frames.StreamFrame) error {
return errInvalidStreamID
}
ss, _ := s.NewStream(frame.StreamID)
ss, _ := s.OpenStream(frame.StreamID)
str = ss.(*stream)
}
if str == nil {
@@ -536,15 +536,15 @@ func (s *Session) updateReceiveFlowControlWindow(streamID protocol.StreamID, byt
return nil
}
// NewStream creates a new stream open for reading and writing
func (s *Session) NewStream(id protocol.StreamID) (utils.Stream, error) {
// OpenStream creates a new stream open for reading and writing
func (s *Session) OpenStream(id protocol.StreamID) (utils.Stream, error) {
s.streamsMutex.Lock()
defer s.streamsMutex.Unlock()
return s.newStreamImpl(id)
}
// GetOrCreateStream returns an existing stream with the given id, or opens a new stream
func (s *Session) GetOrCreateStream(id protocol.StreamID) (utils.Stream, error) {
// GetOrOpenStream returns an existing stream with the given id, or opens a new stream
func (s *Session) GetOrOpenStream(id protocol.StreamID) (utils.Stream, error) {
s.streamsMutex.Lock()
defer s.streamsMutex.Unlock()
if stream, ok := s.streams[id]; ok {

16
session_test.go
View File

@@ -123,7 +123,7 @@ var _ = Describe("Session", func() {
})
It("does not reject existing streams with even StreamIDs", func() {
_, err := session.NewStream(4)
_, err := session.OpenStream(4)
Expect(err).ToNot(HaveOccurred())
err = session.handleStreamFrame(&frames.StreamFrame{
StreamID: 4,
@@ -152,7 +152,7 @@ var _ = Describe("Session", func() {
})
It("does not delete streams with Close()", func() {
str, err := session.NewStream(5)
str, err := session.OpenStream(5)
Expect(err).ToNot(HaveOccurred())
str.Close()
session.garbageCollectStreams()
@@ -258,7 +258,7 @@ var _ = Describe("Session", func() {
Context("handling RST_STREAM frames", func() {
It("closes the receiving streams for writing and reading", func() {
s, err := session.NewStream(5)
s, err := session.OpenStream(5)
Expect(err).ToNot(HaveOccurred())
err = session.handleRstStreamFrame(&frames.RstStreamFrame{
StreamID: 5,
@@ -284,7 +284,7 @@ var _ = Describe("Session", func() {
Context("handling WINDOW_UPDATE frames", func() {
It("updates the Flow Control Windows of a stream", func() {
_, err := session.NewStream(5)
_, err := session.OpenStream(5)
Expect(err).ToNot(HaveOccurred())
err = session.handleWindowUpdateFrame(&frames.WindowUpdateFrame{
StreamID: 5,
@@ -327,7 +327,7 @@ var _ = Describe("Session", func() {
It("closes streams with proper error", func() {
testErr := errors.New("test error")
s, err := session.NewStream(5)
s, err := session.OpenStream(5)
Expect(err).NotTo(HaveOccurred())
session.Close(testErr, true)
Expect(closed).To(BeTrue())
@@ -376,7 +376,7 @@ var _ = Describe("Session", func() {
})
It("sends a WindowUpdate frame", func() {
_, err := session.NewStream(5)
_, err := session.OpenStream(5)
Expect(err).ToNot(HaveOccurred())
err = session.updateReceiveFlowControlWindow(5, 0xDECAFBAD)
Expect(err).ToNot(HaveOccurred())
@@ -387,7 +387,7 @@ var _ = Describe("Session", func() {
})
It("repeats a WindowUpdate frame in WindowUpdateNumRepitions packets", func() {
_, err := session.NewStream(5)
_, err := session.OpenStream(5)
Expect(err).ToNot(HaveOccurred())
err = session.updateReceiveFlowControlWindow(5, 0xDECAFBAD)
Expect(err).ToNot(HaveOccurred())
@@ -515,7 +515,7 @@ var _ = Describe("Session", func() {
Expect(err).ToNot(HaveOccurred())
scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer)
session = newSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
s, err := session.NewStream(3)
s, err := session.OpenStream(3)
Expect(err).NotTo(HaveOccurred())
err = session.handleStreamFrame(&frames.StreamFrame{
StreamID: 1,