From 9010cfd2bbc9da8c16a839a4b9494bfe3b6b9d41 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Sun, 17 Sep 2023 19:20:13 +0700
Subject: [PATCH] remove unused unknownPacketHandler interface (#4093)

---
 mock_unknown_packet_handler_test.go | 58 -----------------------------
 mockgen.go                          |  3 --
 packet_handler_map.go               |  8 ----
 transport.go                        |  4 +-
 4 files changed, 3 insertions(+), 70 deletions(-)
 delete mode 100644 mock_unknown_packet_handler_test.go

diff --git a/mock_unknown_packet_handler_test.go b/mock_unknown_packet_handler_test.go
deleted file mode 100644
index 6f29101a..00000000
--- a/mock_unknown_packet_handler_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/quic-go/quic-go (interfaces: UnknownPacketHandler)
-
-// Package quic is a generated GoMock package.
-package quic
-
-import (
-	reflect "reflect"
-
-	gomock "go.uber.org/mock/gomock"
-)
-
-// MockUnknownPacketHandler is a mock of UnknownPacketHandler interface.
-type MockUnknownPacketHandler struct {
-	ctrl     *gomock.Controller
-	recorder *MockUnknownPacketHandlerMockRecorder
-}
-
-// MockUnknownPacketHandlerMockRecorder is the mock recorder for MockUnknownPacketHandler.
-type MockUnknownPacketHandlerMockRecorder struct {
-	mock *MockUnknownPacketHandler
-}
-
-// NewMockUnknownPacketHandler creates a new mock instance.
-func NewMockUnknownPacketHandler(ctrl *gomock.Controller) *MockUnknownPacketHandler {
-	mock := &MockUnknownPacketHandler{ctrl: ctrl}
-	mock.recorder = &MockUnknownPacketHandlerMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockUnknownPacketHandler) EXPECT() *MockUnknownPacketHandlerMockRecorder {
-	return m.recorder
-}
-
-// handlePacket mocks base method.
-func (m *MockUnknownPacketHandler) handlePacket(arg0 receivedPacket) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "handlePacket", arg0)
-}
-
-// handlePacket indicates an expected call of handlePacket.
-func (mr *MockUnknownPacketHandlerMockRecorder) handlePacket(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "handlePacket", reflect.TypeOf((*MockUnknownPacketHandler)(nil).handlePacket), arg0)
-}
-
-// setCloseError mocks base method.
-func (m *MockUnknownPacketHandler) setCloseError(arg0 error) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "setCloseError", arg0)
-}
-
-// setCloseError indicates an expected call of setCloseError.
-func (mr *MockUnknownPacketHandlerMockRecorder) setCloseError(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "setCloseError", reflect.TypeOf((*MockUnknownPacketHandler)(nil).setCloseError), arg0)
-}
diff --git a/mockgen.go b/mockgen.go
index ea0aa58b..eb247386 100644
--- a/mockgen.go
+++ b/mockgen.go
@@ -62,9 +62,6 @@ type QUICConn = quicConn
 //go:generate sh -c "go run go.uber.org/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_packet_handler_test.go github.com/quic-go/quic-go PacketHandler"
 type PacketHandler = packetHandler
 
-//go:generate sh -c "go run go.uber.org/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_unknown_packet_handler_test.go github.com/quic-go/quic-go UnknownPacketHandler"
-type UnknownPacketHandler = unknownPacketHandler
-
 //go:generate sh -c "go run go.uber.org/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_packet_handler_manager_test.go github.com/quic-go/quic-go PacketHandlerManager"
 type PacketHandlerManager = packetHandlerManager
 
diff --git a/packet_handler_map.go b/packet_handler_map.go
index ba30fb23..006eadf9 100644
--- a/packet_handler_map.go
+++ b/packet_handler_map.go
@@ -4,7 +4,6 @@ import (
 	"crypto/hmac"
 	"crypto/rand"
 	"crypto/sha256"
-	"errors"
 	"hash"
 	"io"
 	"net"
@@ -45,13 +44,6 @@ type closePacket struct {
 	info    packetInfo
 }
 
-type unknownPacketHandler interface {
-	handlePacket(receivedPacket)
-	setCloseError(error)
-}
-
-var errListenerAlreadySet = errors.New("listener already set")
-
 type packetHandlerMap struct {
 	mutex       sync.Mutex
 	handlers    map[protocol.ConnectionID]packetHandler
diff --git a/transport.go b/transport.go
index 14d6b1fd..60d44a43 100644
--- a/transport.go
+++ b/transport.go
@@ -16,6 +16,8 @@ import (
 	"github.com/quic-go/quic-go/logging"
 )
 
+var errListenerAlreadySet = errors.New("listener already set")
+
 // The Transport is the central point to manage incoming and outgoing QUIC connections.
 // QUIC demultiplexes connections based on their QUIC Connection IDs, not based on the 4-tuple.
 // This means that a single UDP socket can be used for listening for incoming connections, as well as
@@ -91,7 +93,7 @@ type Transport struct {
 	// If no ConnectionIDGenerator is set, this is set to a default.
 	connIDGenerator ConnectionIDGenerator
 
-	server unknownPacketHandler
+	server *baseServer
 
 	conn rawConn