From b558bb8a75d80e736b813882930e287f9be4297f Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Sun, 15 May 2016 15:32:26 +0200 Subject: [PATCH] privatize packetHandler ref #60 --- server.go | 10 +++++----- server_test.go | 4 ++-- session.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server.go b/server.go index feb70251..05d2d153 100644 --- a/server.go +++ b/server.go @@ -12,8 +12,8 @@ import ( "github.com/lucas-clemente/quic-go/utils" ) -// PacketHandler handles packets -type PacketHandler interface { +// packetHandler handles packets +type packetHandler interface { HandlePacket(addr interface{}, publicHeader *PublicHeader, data []byte) Run() } @@ -26,12 +26,12 @@ type Server struct { signer crypto.Signer scfg *handshake.ServerConfig - sessions map[protocol.ConnectionID]PacketHandler + sessions map[protocol.ConnectionID]packetHandler sessionsMutex sync.RWMutex streamCallback StreamCallback - newSession func(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback CloseCallback) PacketHandler + newSession func(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback CloseCallback) packetHandler } // NewServer makes a new server @@ -47,7 +47,7 @@ func NewServer(tlsConfig *tls.Config, cb StreamCallback) (*Server, error) { signer: signer, scfg: scfg, streamCallback: cb, - sessions: map[protocol.ConnectionID]PacketHandler{}, + sessions: map[protocol.ConnectionID]packetHandler{}, newSession: NewSession, }, nil } diff --git a/server_test.go b/server_test.go index fe8c9fc0..22b32843 100644 --- a/server_test.go +++ b/server_test.go @@ -25,7 +25,7 @@ func (s *mockSession) HandlePacket(addr interface{}, publicHeader *PublicHeader, func (s *mockSession) Run() { } -func newMockSession(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback CloseCallback) PacketHandler { +func newMockSession(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback CloseCallback) packetHandler { return &mockSession{ connectionID: connectionID, } @@ -39,7 +39,7 @@ var _ = Describe("Server", func() { BeforeEach(func() { server = &Server{ - sessions: map[protocol.ConnectionID]PacketHandler{}, + sessions: map[protocol.ConnectionID]packetHandler{}, newSession: newMockSession, } }) diff --git a/session.go b/session.go index d20355d0..5cefe8c3 100644 --- a/session.go +++ b/session.go @@ -76,7 +76,7 @@ type Session struct { } // NewSession makes a new session -func NewSession(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback CloseCallback) PacketHandler { +func NewSession(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback CloseCallback) packetHandler { stopWaitingManager := ackhandler.NewStopWaitingManager() session := &Session{ connectionID: connectionID,