refactor: remove unused code

igoogolx · Nov 8, 2023 · b4d084d · b4d084d
1 parent 50c1a42
commit b4d084d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/internal/conn/tcp.go b/internal/conn/tcp.go
@@ -3,7 +3,6 @@ package conn
 import (
 	"context"
 	"github.com/Dreamacro/clash/component/dialer"
-	"github.com/Dreamacro/clash/constant"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/gofrs/uuid/v5"
 	"github.com/igoogolx/itun2socks/internal/constants"
@@ -15,7 +14,7 @@ type TcpConnContext struct {
 	wg       *sync.WaitGroup
 	ctx      context.Context
 	id       uuid.UUID
-	metadata *constant.Metadata
+	metadata *C.Metadata
 	conn     net.Conn
 	rule     constants.RuleType
 }
@@ -36,15 +35,15 @@ func (t *TcpConnContext) ID() uuid.UUID {
 	return t.id
 }
 
-func (t *TcpConnContext) Metadata() *constant.Metadata {
+func (t *TcpConnContext) Metadata() *C.Metadata {
 	return t.metadata
 }
 
 func (t *TcpConnContext) Conn() net.Conn {
 	return t.conn
 }
 
-func NewTcpConnContext(ctx context.Context, conn net.Conn, metadata *constant.Metadata, wg *sync.WaitGroup) *TcpConnContext {
+func NewTcpConnContext(ctx context.Context, conn net.Conn, metadata *C.Metadata, wg *sync.WaitGroup) *TcpConnContext {
 	id, _ := uuid.NewV4()
 	rule := GetMatcher().GetRule(metadata.DstIP.String())
 	return &TcpConnContext{

diff --git a/internal/conn/udp.go b/internal/conn/udp.go
@@ -3,7 +3,6 @@ package conn
 import (
 	"context"
 	"github.com/Dreamacro/clash/component/dialer"
-	"github.com/Dreamacro/clash/constant"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/gofrs/uuid/v5"
 	"github.com/igoogolx/itun2socks/internal/constants"
@@ -24,7 +23,7 @@ type UdpConnContext struct {
 	wg       *sync.WaitGroup
 	ctx      context.Context
 	id       uuid.UUID
-	metadata *constant.Metadata
+	metadata *C.Metadata
 	conn     UdpConn
 	rule     constants.RuleType
 }
@@ -45,15 +44,15 @@ func (u *UdpConnContext) ID() uuid.UUID {
 	return u.id
 }
 
-func (u *UdpConnContext) Metadata() *constant.Metadata {
+func (u *UdpConnContext) Metadata() *C.Metadata {
 	return u.metadata
 }
 
 func (u *UdpConnContext) Conn() UdpConn {
 	return u.conn
 }
 
-func NewUdpConnContext(ctx context.Context, conn UdpConn, metadata *constant.Metadata, wg *sync.WaitGroup) (*UdpConnContext, error) {
+func NewUdpConnContext(ctx context.Context, conn UdpConn, metadata *C.Metadata, wg *sync.WaitGroup) (*UdpConnContext, error) {
 	id, _ := uuid.NewV4()
 	rule := GetMatcher().GetRule(metadata.DstIP.String())