From f10dc3d619e1fb3aa7b219abddb47faef65200a9 Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Wed, 11 Sep 2024 13:39:16 +0100 Subject: [PATCH] use a constructor for PacketConnWrapper --- client/lib/connwrapper.go | 8 ++++++++ client/lib/snowflake.go | 7 ++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/client/lib/connwrapper.go b/client/lib/connwrapper.go index 0eb8d98..eadba2a 100644 --- a/client/lib/connwrapper.go +++ b/client/lib/connwrapper.go @@ -9,6 +9,14 @@ import ( var errENOSYS = errors.New("not implemented") +func newPacketConnWrapper(localAddr, remoteAddr net.Addr, rw io.ReadWriter) net.PacketConn { + return &packetConnWrapper{ + ReadWriter: rw, + remoteAddr: remoteAddr, + localAddr: localAddr, + } +} + type packetConnWrapper struct { io.ReadWriter remoteAddr net.Addr diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index f4ad630..e31c06c 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -344,11 +344,8 @@ func newSession(snowflakes SnowflakeCollector, clientIDCandid turbotunnel.Client return nil, errors.New("handler: Received invalid Snowflake") } log.Println("---- Handler: snowflake assigned ----") - packetConnWrapper := &packetConnWrapper{ - ReadWriter: conn, - remoteAddr: dummyAddr{}, - localAddr: dummyAddr{}, - } + + packetConnWrapper := newPacketConnWrapper(dummyAddr{}, dummyAddr{}, conn) return packetConnWrapper, nil } pconn := turbotunnel.NewRedialPacketConn(dummyAddr{}, dummyAddr{}, dialContext)