From 36c77a56c92d90fd931028712bcc6233d2b71f0c Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sun, 3 Nov 2019 09:01:17 +0700 Subject: [PATCH] simplify the packetHandlerManager interface --- server.go | 14 +------------- session.go | 8 ++++++++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/server.go b/server.go index fdd9f48de..68c5d4612 100644 --- a/server.go +++ b/server.go @@ -35,14 +35,10 @@ type unknownPacketHandler interface { type packetHandlerManager interface { io.Closer Add(protocol.ConnectionID, packetHandler) - Retire(protocol.ConnectionID) - Remove(protocol.ConnectionID) - ReplaceWithClosed(protocol.ConnectionID, packetHandler) - AddResetToken([16]byte, packetHandler) - RemoveResetToken([16]byte) GetStatelessResetToken(protocol.ConnectionID) [16]byte SetServer(unknownPacketHandler) CloseServer() + sessionRunner } type quicSession interface { @@ -57,14 +53,6 @@ type quicSession interface { closeRemote(error) } -type sessionRunner interface { - Retire(protocol.ConnectionID) - Remove(protocol.ConnectionID) - ReplaceWithClosed(protocol.ConnectionID, packetHandler) - AddResetToken([16]byte, packetHandler) - RemoveResetToken([16]byte) -} - // A Listener of QUIC type baseServer struct { mutex sync.Mutex diff --git a/session.go b/session.go index f7d73ae5d..c4cd22fe3 100644 --- a/session.go +++ b/session.go @@ -72,6 +72,14 @@ func (p *receivedPacket) Clone() *receivedPacket { } } +type sessionRunner interface { + Retire(protocol.ConnectionID) + Remove(protocol.ConnectionID) + ReplaceWithClosed(protocol.ConnectionID, packetHandler) + AddResetToken([16]byte, packetHandler) + RemoveResetToken([16]byte) +} + type handshakeRunner struct { onReceivedParams func([]byte) onError func(error)