chore: change C.PacketAdapter from a struct to an interface

adapter/inbound/packet.go

@@ -5,9 +5,18 @@ import (
 	"github.com/Dreamacro/clash/transport/socks5"
 )
 
+// PacketAdapter is a UDP Packet adapter for socks/redir/tun
+type PacketAdapter struct {
+	C.UDPPacket
+	metadata *C.Metadata
+}
 
+// Metadata returns destination metadata
+func (s *PacketAdapter) Metadata() *C.Metadata {
+	return s.metadata
+}
 
-func NewPacketWithInfos(target socks5.Addr, packet C.UDPPacket, source C.Type, inName , preferRulesName string) *C.PacketAdapter {
+func NewPacketWithInfos(target socks5.Addr, packet C.UDPPacket, source C.Type, inName, preferRulesName string) C.PacketAdapter {
 	metadata := parseSocksAddr(target)
 	metadata.NetWork = C.UDP
 	metadata.Type = source
@@ -24,13 +33,13 @@ func NewPacketWithInfos(target socks5.Addr, packet C.UDPPacket, source C.Type, i
 		}
 	}
 
-	return C.NewPacketAdapter(
+	return &PacketAdapter{
 		packet,
 		metadata,
-	)
+	}
 }
 
 // NewPacket is PacketAdapter generator
-func NewPacket(target socks5.Addr, packet C.UDPPacket, source C.Type) *C.PacketAdapter {
+func NewPacket(target socks5.Addr, packet C.UDPPacket, source C.Type) C.PacketAdapter {
 	return NewPacketWithInfos(target, packet, source, "", "")
 }

config/config.go

@@ -14,16 +14,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Dreamacro/clash/common/utils"
-	"github.com/Dreamacro/clash/listener/sing_tun"
-	"github.com/Dreamacro/clash/listener/tunnel"
-	R "github.com/Dreamacro/clash/rules"
-	RP "github.com/Dreamacro/clash/rules/provider"
-	L "github.com/Dreamacro/clash/listener"
 	"github.com/Dreamacro/clash/adapter"
 	"github.com/Dreamacro/clash/adapter/outbound"
 	"github.com/Dreamacro/clash/adapter/outboundgroup"
 	"github.com/Dreamacro/clash/adapter/provider"
+	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/auth"
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/fakeip"
@@ -34,7 +29,12 @@ import (
 	providerTypes "github.com/Dreamacro/clash/constant/provider"
 	snifferTypes "github.com/Dreamacro/clash/constant/sniffer"
 	"github.com/Dreamacro/clash/dns"
+	L "github.com/Dreamacro/clash/listener"
+	LC "github.com/Dreamacro/clash/listener/config"
+	"github.com/Dreamacro/clash/listener/tunnel"
 	"github.com/Dreamacro/clash/log"
+	R "github.com/Dreamacro/clash/rules"
+	RP "github.com/Dreamacro/clash/rules/provider"
 	T "github.com/Dreamacro/clash/tunnel"
 
 	"gopkg.in/yaml.v3"
@@ -149,11 +149,11 @@ type Tun struct {
 	RedirectToTun       []string         `yaml:"-" json:"-"`
 
 	MTU                    uint32            `yaml:"mtu" json:"mtu,omitempty"`
-	Inet4Address           []sing_tun.ListenPrefix `yaml:"inet4-address" json:"inet4-address,omitempty"`
+	Inet4Address           []LC.ListenPrefix `yaml:"inet4-address" json:"inet4-address,omitempty"`
-	Inet6Address           []sing_tun.ListenPrefix `yaml:"inet6-address" json:"inet6-address,omitempty"`
+	Inet6Address           []LC.ListenPrefix `yaml:"inet6-address" json:"inet6-address,omitempty"`
 	StrictRoute            bool              `yaml:"strict-route" json:"strict-route,omitempty"`
-	Inet4RouteAddress      []sing_tun.ListenPrefix `yaml:"inet4-route-address" json:"inet4-route-address,omitempty"`
+	Inet4RouteAddress      []LC.ListenPrefix `yaml:"inet4-route-address" json:"inet4-route-address,omitempty"`
-	Inet6RouteAddress      []sing_tun.ListenPrefix `yaml:"inet6-route-address" json:"inet6-route-address,omitempty"`
+	Inet6RouteAddress      []LC.ListenPrefix `yaml:"inet6-route-address" json:"inet6-route-address,omitempty"`
 	IncludeUID             []uint32          `yaml:"include-uid" json:"include-uid,omitempty"`
 	IncludeUIDRange        []string          `yaml:"include-uid-range" json:"include-uid-range,omitempty"`
 	ExcludeUID             []uint32          `yaml:"exclude-uid" json:"exclude-uid,omitempty"`
@@ -244,10 +244,10 @@ type RawTun struct {
 
 	MTU uint32 `yaml:"mtu" json:"mtu,omitempty"`
 	//Inet4Address           []ListenPrefix `yaml:"inet4-address" json:"inet4_address,omitempty"`
-	Inet6Address           []sing_tun.ListenPrefix `yaml:"inet6-address" json:"inet6_address,omitempty"`
+	Inet6Address           []LC.ListenPrefix `yaml:"inet6-address" json:"inet6_address,omitempty"`
 	StrictRoute            bool              `yaml:"strict-route" json:"strict_route,omitempty"`
-	Inet4RouteAddress      []sing_tun.ListenPrefix `yaml:"inet4_route_address" json:"inet4_route_address,omitempty"`
+	Inet4RouteAddress      []LC.ListenPrefix `yaml:"inet4_route_address" json:"inet4_route_address,omitempty"`
-	Inet6RouteAddress      []sing_tun.ListenPrefix `yaml:"inet6_route_address" json:"inet6_route_address,omitempty"`
+	Inet6RouteAddress      []LC.ListenPrefix `yaml:"inet6_route_address" json:"inet6_route_address,omitempty"`
 	IncludeUID             []uint32          `yaml:"include-uid" json:"include_uid,omitempty"`
 	IncludeUIDRange        []string          `yaml:"include-uid-range" json:"include_uid_range,omitempty"`
 	ExcludeUID             []uint32          `yaml:"exclude-uid" json:"exclude_uid,omitempty"`
@@ -272,7 +272,6 @@ type RawTuicServer struct {
 	MaxUdpRelayPacketSize int      `yaml:"max-udp-relay-packet-size" json:"max-udp-relay-packet-size,omitempty"`
 }
 
-
 type RawConfig struct {
 	Port                  int             `yaml:"port"`
 	SocksPort             int             `yaml:"socks-port"`
@@ -384,7 +383,7 @@ func UnmarshalRawConfig(buf []byte) (*RawConfig, error) {
 			DNSHijack:           []string{"0.0.0.0:53"}, // default hijack all dns query
 			AutoRoute:           true,
 			AutoDetectInterface: true,
-			Inet6Address:        []sing_tun.ListenPrefix{sing_tun.ListenPrefix(netip.MustParsePrefix("fdfe:dcba:9876::1/126"))},
+			Inet6Address:        []LC.ListenPrefix{LC.ListenPrefix(netip.MustParsePrefix("fdfe:dcba:9876::1/126"))},
 		},
 		TuicServer: RawTuicServer{
 			Enable:                false,
@@ -1232,7 +1231,7 @@ func parseTun(rawTun RawTun, general *General) error {
 		RedirectToTun:       rawTun.RedirectToTun,
 
 		MTU:                    rawTun.MTU,
-		Inet4Address:           []sing_tun.ListenPrefix{sing_tun.ListenPrefix(tunAddressPrefix)},
+		Inet4Address:           []LC.ListenPrefix{LC.ListenPrefix(tunAddressPrefix)},
 		Inet6Address:           rawTun.Inet6Address,
 		StrictRoute:            rawTun.StrictRoute,
 		Inet4RouteAddress:      rawTun.Inet4RouteAddress,

constant/adapters.go

@@ -210,3 +210,9 @@ type UDPPacket interface {
 type UDPPacketInAddr interface {
 	InAddr() net.Addr
 }
+
+// PacketAdapter is a UDP Packet adapter for socks/redir/tun
+type PacketAdapter interface {
+	UDPPacket
+	Metadata() *Metadata
+}

constant/listener.go

@@ -16,26 +16,8 @@ type AdvanceListener interface {
 
 type NewListener interface {
 	Name() string
-	ReCreate(tcpIn chan<- ConnContext,udpIn chan<-*PacketAdapter) error
+	ReCreate(tcpIn chan<- ConnContext, udpIn chan<- PacketAdapter) error
 	Close() error
 	Address() string
 	RawAddress() string
 }
-
-// PacketAdapter is a UDP Packet adapter for socks/redir/tun
-type PacketAdapter struct {
-	UDPPacket
-	metadata *Metadata
-}
-
-func NewPacketAdapter(udppacket UDPPacket,metadata *Metadata)*PacketAdapter{
-return &PacketAdapter{
-	udppacket,
-	metadata,
-}
-}
-
-// Metadata returns destination metadata
-func (s *PacketAdapter) Metadata() *Metadata {
-	return s.metadata
-}

hub/executor/executor.go

@@ -8,6 +8,7 @@ import (
 	"sync"
 
 	"github.com/Dreamacro/clash/adapter"
+	"github.com/Dreamacro/clash/adapter/inbound"
 	"github.com/Dreamacro/clash/adapter/outboundgroup"
 	"github.com/Dreamacro/clash/component/auth"
 	"github.com/Dreamacro/clash/component/dialer"
@@ -25,11 +26,9 @@ import (
 	"github.com/Dreamacro/clash/dns"
 	"github.com/Dreamacro/clash/listener"
 	authStore "github.com/Dreamacro/clash/listener/auth"
-	"github.com/Dreamacro/clash/adapter/inbound"
+	LC "github.com/Dreamacro/clash/listener/config"
 	"github.com/Dreamacro/clash/listener/inner"
-	"github.com/Dreamacro/clash/listener/sing_tun"
 	"github.com/Dreamacro/clash/listener/tproxy"
-	"github.com/Dreamacro/clash/listener/tuic"
 	T "github.com/Dreamacro/clash/listener/tunnel"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
@@ -281,7 +280,7 @@ func updateTun(general *config.General) {
 	if general == nil {
 		return
 	}
-	listener.ReCreateTun(sing_tun.Tun(general.Tun), tunnel.TCPIn(), tunnel.UDPIn())
+	listener.ReCreateTun(LC.Tun(general.Tun), tunnel.TCPIn(), tunnel.UDPIn())
 	listener.ReCreateRedirToTun(general.Tun.RedirectToTun)
 }
 
@@ -367,7 +366,7 @@ func updateGeneral(general *config.General, force bool) {
 	listener.ReCreateMixed(general.MixedPort, tcpIn, udpIn)
 	listener.ReCreateShadowSocks(general.ShadowSocksConfig, tcpIn, udpIn)
 	listener.ReCreateVmess(general.VmessConfig, tcpIn, udpIn)
-	listener.ReCreateTuic(tuic.TuicServer(general.TuicServer), tcpIn, udpIn)
+	listener.ReCreateTuic(LC.TuicServer(general.TuicServer), tcpIn, udpIn)
 }
 
 func updateUsers(users []auth.AuthUser) {

hub/route/configs.go

@@ -13,8 +13,7 @@ import (
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/hub/executor"
 	P "github.com/Dreamacro/clash/listener"
-	"github.com/Dreamacro/clash/listener/sing_tun"
+	LC "github.com/Dreamacro/clash/listener/config"
-	"github.com/Dreamacro/clash/listener/tuic"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
 
@@ -69,10 +68,10 @@ type tunSchema struct {
 
 	MTU *uint32 `yaml:"mtu" json:"mtu,omitempty"`
 	//Inet4Address           *[]config.ListenPrefix `yaml:"inet4-address" json:"inet4-address,omitempty"`
-	Inet6Address           *[]sing_tun.ListenPrefix `yaml:"inet6-address" json:"inet6-address,omitempty"`
+	Inet6Address           *[]LC.ListenPrefix `yaml:"inet6-address" json:"inet6-address,omitempty"`
 	StrictRoute            *bool              `yaml:"strict-route" json:"strict-route,omitempty"`
-	Inet4RouteAddress      *[]sing_tun.ListenPrefix `yaml:"inet4-route-address" json:"inet4-route-address,omitempty"`
+	Inet4RouteAddress      *[]LC.ListenPrefix `yaml:"inet4-route-address" json:"inet4-route-address,omitempty"`
-	Inet6RouteAddress      *[]sing_tun.ListenPrefix `yaml:"inet6-route-address" json:"inet6-route-address,omitempty"`
+	Inet6RouteAddress      *[]LC.ListenPrefix `yaml:"inet6-route-address" json:"inet6-route-address,omitempty"`
 	IncludeUID             *[]uint32          `yaml:"include-uid" json:"include-uid,omitempty"`
 	IncludeUIDRange        *[]string          `yaml:"include-uid-range" json:"include-uid-range,omitempty"`
 	ExcludeUID             *[]uint32          `yaml:"exclude-uid" json:"exclude-uid,omitempty"`
@@ -118,7 +117,7 @@ func pointerOrDefaultString(p *string, def string) string {
 	return def
 }
 
-func pointerOrDefaultTun(p *tunSchema, def sing_tun.Tun) sing_tun.Tun {
+func pointerOrDefaultTun(p *tunSchema, def LC.Tun) LC.Tun {
 	if p != nil {
 		def.Enable = p.Enable
 		if p.Device != nil {
@@ -176,7 +175,7 @@ func pointerOrDefaultTun(p *tunSchema, def sing_tun.Tun) sing_tun.Tun {
 	return def
 }
 
-func pointerOrDefaultTuicServer(p *tuicServerSchema, def tuic.TuicServer) tuic.TuicServer {
+func pointerOrDefaultTuicServer(p *tuicServerSchema, def LC.TuicServer) LC.TuicServer {
 	if p != nil {
 		def.Enable = p.Enable
 		if p.Listen != nil {

hub/route/server.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/Dreamacro/clash/adapter/inbound"
+	CN "github.com/Dreamacro/clash/common/net"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
-	CN "github.com/Dreamacro/clash/common/net"
 	"github.com/Dreamacro/clash/tunnel/statistic"
 
 	"github.com/go-chi/chi/v5"

listener/config/tuic.go

@@ -0,0 +1,23 @@
+package config
+
+import (
+	"encoding/json"
+)
+
+type TuicServer struct {
+	Enable                bool
+	Listen                string
+	Token                 []string
+	Certificate           string
+	PrivateKey            string
+	CongestionController  string
+	MaxIdleTime           int
+	AuthenticationTimeout int
+	ALPN                  []string
+	MaxUdpRelayPacketSize int
+}
+
+func (t TuicServer) String() string {
+	b, _ := json.Marshal(t)
+	return string(b)
+}

listener/config/tun.go

@@ -1,4 +1,4 @@
-package sing_tun
+package config
 
 import (
 	"encoding/json"

listener/inbound/base.go

@@ -52,7 +52,7 @@ func (b *Base) RawAddress() string {
 }
 
 // ReCreate implements constant.NewListener
-func (*Base) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) error {
+func (*Base) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) error {
 	return nil
 }
 

listener/inbound/http.go

@@ -30,7 +30,7 @@ func (h *HTTP) Address() string {
 }
 
 // ReCreate implements constant.NewListener
-func (h *HTTP) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) error {
+func (h *HTTP) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) error {
 	var err error
 	_ = h.Close()
 	h.l, err = http.NewWithInfos(h.RawAddress(), h.name, h.preferRulesName, tcpIn)

listener/inbound/mixed.go

@@ -39,7 +39,7 @@ func (m *Mixed) Address() string {
 }
 
 // ReCreate implements constant.NewListener
-func (m *Mixed) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) error {
+func (m *Mixed) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) error {
 	var err error
 	_ = m.Close()
 	m.l, err = mixed.NewWithInfos(m.RawAddress(), m.name, m.preferRulesName, tcpIn)

listener/inbound/redir.go

@@ -31,7 +31,7 @@ func (r *Redir) Address() string {
 }
 
 // ReCreate implements constant.NewListener
-func (r *Redir) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) error {
+func (r *Redir) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) error {
 	var err error
 	_ = r.Close()
 	r.l, err = redir.NewWithInfos(r.Address(), r.name, r.preferRulesName, tcpIn)

listener/inbound/socks.go

@@ -60,7 +60,7 @@ func (s *Socks) Address() string {
 }
 
 // ReCreate implements constant.NewListener
-func (s *Socks) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) error {
+func (s *Socks) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) error {
 	s.mux.Lock()
 	defer s.mux.Unlock()
 	var err error

listener/inbound/tproxy.go

@@ -38,7 +38,7 @@ func (t *TProxy) Address() string {
 }
 
 // ReCreate implements constant.NewListener
-func (t *TProxy) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) error {
+func (t *TProxy) ReCreate(tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) error {
 	var err error
 	_ = t.Close()
 	t.lTCP, err = tproxy.NewWithInfos(t.RawAddress(), t.name, t.preferRulesName, tcpIn)

listener/listener.go

@@ -12,6 +12,7 @@ import (
 	"github.com/Dreamacro/clash/component/ebpf"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/listener/autoredir"
+	LC "github.com/Dreamacro/clash/listener/config"
 	"github.com/Dreamacro/clash/listener/http"
 	"github.com/Dreamacro/clash/listener/mixed"
 	"github.com/Dreamacro/clash/listener/redir"
@@ -64,8 +65,8 @@ var (
 	autoRedirMux sync.Mutex
 	tcMux        sync.Mutex
 
-	LastTunConf  sing_tun.Tun
+	LastTunConf  LC.Tun
-	LastTuicConf tuic.TuicServer
+	LastTuicConf LC.TuicServer
 )
 
 type Ports struct {
@@ -78,18 +79,18 @@ type Ports struct {
 	VmessConfig       string `json:"vmess-config"`
 }
 
-func GetTunConf() sing_tun.Tun {
+func GetTunConf() LC.Tun {
 	if tunLister == nil {
-		return sing_tun.Tun{
+		return LC.Tun{
 			Enable: false,
 		}
 	}
 	return tunLister.Config()
 }
 
-func GetTuicConf() tuic.TuicServer {
+func GetTuicConf() LC.TuicServer {
 	if tuicListener == nil {
-		return tuic.TuicServer{Enable: false}
+		return LC.TuicServer{Enable: false}
 	}
 	return tuicListener.Config()
 }
@@ -144,7 +145,7 @@ func ReCreateHTTP(port int, tcpIn chan<- C.ConnContext) {
 	log.Infoln("HTTP proxy listening at: %s", httpListener.Address())
 }
 
-func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) {
+func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) {
 	socksMux.Lock()
 	defer socksMux.Unlock()
 
@@ -203,7 +204,7 @@ func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketA
 	log.Infoln("SOCKS proxy listening at: %s", socksListener.Address())
 }
 
-func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) {
+func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) {
 	redirMux.Lock()
 	defer redirMux.Unlock()
 
@@ -249,7 +250,7 @@ func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketA
 	log.Infoln("Redirect proxy listening at: %s", redirListener.Address())
 }
 
-func ReCreateShadowSocks(shadowSocksConfig string, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) {
+func ReCreateShadowSocks(shadowSocksConfig string, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) {
 	ssMux.Lock()
 	defer ssMux.Unlock()
 
@@ -289,7 +290,7 @@ func ReCreateShadowSocks(shadowSocksConfig string, tcpIn chan<- C.ConnContext, u
 	return
 }
 
-func ReCreateVmess(vmessConfig string, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) {
+func ReCreateVmess(vmessConfig string, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) {
 	vmessMux.Lock()
 	defer vmessMux.Unlock()
 
@@ -329,7 +330,7 @@ func ReCreateVmess(vmessConfig string, tcpIn chan<- C.ConnContext, udpIn chan<-
 	return
 }
 
-func ReCreateTuic(config tuic.TuicServer, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) {
+func ReCreateTuic(config LC.TuicServer, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) {
 	tuicMux.Lock()
 	defer func() {
 		LastTuicConf = config
@@ -371,7 +372,7 @@ func ReCreateTuic(config tuic.TuicServer, tcpIn chan<- C.ConnContext, udpIn chan
 	return
 }
 
-func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) {
+func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) {
 	tproxyMux.Lock()
 	defer tproxyMux.Unlock()
 
@@ -417,7 +418,7 @@ func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *C.Packet
 	log.Infoln("TProxy server listening at: %s", tproxyListener.Address())
 }
 
-func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) {
+func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) {
 	mixedMux.Lock()
 	defer mixedMux.Unlock()
 
@@ -472,7 +473,7 @@ func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketA
 	log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address())
 }
 
-func ReCreateTun(tunConf sing_tun.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) {
+func ReCreateTun(tunConf LC.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) {
 	tunMux.Lock()
 	defer func() {
 		LastTunConf = tunConf
@@ -536,7 +537,7 @@ func ReCreateRedirToTun(ifaceNames []string) {
 	log.Infoln("Attached tc ebpf program to interfaces %v", tcProgram.RawNICs())
 }
 
-func ReCreateAutoRedir(ifaceNames []string, tcpIn chan<- C.ConnContext, _ chan<- *C.PacketAdapter) {
+func ReCreateAutoRedir(ifaceNames []string, tcpIn chan<- C.ConnContext, _ chan<- C.PacketAdapter) {
 	autoRedirMux.Lock()
 	defer autoRedirMux.Unlock()
 
@@ -592,7 +593,7 @@ func ReCreateAutoRedir(ifaceNames []string, tcpIn chan<- C.ConnContext, _ chan<-
 	log.Infoln("Auto redirect proxy listening at: %s, attached tc ebpf program to interfaces %v", autoRedirListener.Address(), autoRedirProgram.RawNICs())
 }
 
-func PatchTunnel(tunnels []tunnel.Tunnel, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) {
+func PatchTunnel(tunnels []tunnel.Tunnel, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) {
 	tunnelMux.Lock()
 	defer tunnelMux.Unlock()
 
@@ -745,7 +746,7 @@ func genAddr(host string, port int, allowLan bool) string {
 	return fmt.Sprintf("127.0.0.1:%d", port)
 }
 
-func hasTunConfigChange(tunConf *sing_tun.Tun) bool {
+func hasTunConfigChange(tunConf *LC.Tun) bool {
 	if LastTunConf.Enable != tunConf.Enable ||
 		LastTunConf.Device != tunConf.Device ||
 		LastTunConf.Stack != tunConf.Stack ||
@@ -833,5 +834,5 @@ func Cleanup(wait bool) {
 		tunLister.Close()
 		tunLister = nil
 	}
-	LastTunConf = sing_tun.Tun{}
+	LastTunConf = LC.Tun{}
 }

listener/parse.go

@@ -25,23 +25,38 @@ func ParseListener(mapping map[string]any) (C.NewListener, error) {
 	switch proxyType {
 	case "socks":
 		socksOption := &IN.SocksOption{}
-		decoder.Decode(mapping, socksOption)
+		err = decoder.Decode(mapping, socksOption)
+		if err != nil {
+			return nil, err
+		}
 		listener, err = IN.NewSocks(socksOption)
 	case "http":
 		httpOption := &IN.HTTPOption{}
-		decoder.Decode(mapping, httpOption)
+		err = decoder.Decode(mapping, httpOption)
+		if err != nil {
+			return nil, err
+		}
 		listener, err = IN.NewHTTP(httpOption)
 	case "tproxy":
 		tproxyOption := &IN.TProxyOption{}
-		decoder.Decode(mapping, tproxyOption)
+		err = decoder.Decode(mapping, tproxyOption)
+		if err != nil {
+			return nil, err
+		}
 		listener, err = IN.NewTProxy(tproxyOption)
 	case "redir":
 		redirOption := &IN.RedirOption{}
-		decoder.Decode(mapping, redirOption)
+		err = decoder.Decode(mapping, redirOption)
+		if err != nil {
+			return nil, err
+		}
 		listener, err = IN.NewRedir(redirOption)
 	case "mixed":
 		mixedOption := &IN.MixedOption{}
-		decoder.Decode(mapping, mixedOption)
+		err = decoder.Decode(mapping, mixedOption)
+		if err != nil {
+			return nil, err
+		}
 		listener, err = IN.NewMixed(mixedOption)
 	default:
 		return nil, fmt.Errorf("unsupport proxy type: %s", proxyType)

listener/shadowsocks/tcp.go

@@ -21,7 +21,7 @@ type Listener struct {
 
 var _listener *Listener
 
-func New(config string, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) (*Listener, error) {
+func New(config string, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) (*Listener, error) {
 	addr, cipher, password, err := ParseSSURL(config)
 	if err != nil {
 		return nil, err

listener/shadowsocks/udp.go

@@ -17,7 +17,7 @@ type UDPListener struct {
 	closed     bool
 }
 
-func NewUDP(addr string, pickCipher core.Cipher, in chan<- *C.PacketAdapter) (*UDPListener, error) {
+func NewUDP(addr string, pickCipher core.Cipher, in chan<- C.PacketAdapter) (*UDPListener, error) {
 	l, err := net.ListenPacket("udp", addr)
 	if err != nil {
 		return nil, err
@@ -53,7 +53,7 @@ func (l *UDPListener) Close() error {
 	return l.packetConn.Close()
 }
 
-func handleSocksUDP(pc net.PacketConn, in chan<- *C.PacketAdapter, buf []byte, addr net.Addr) {
+func handleSocksUDP(pc net.PacketConn, in chan<- C.PacketAdapter, buf []byte, addr net.Addr) {
 	tgtAddr := socks5.SplitAddr(buf)
 	if tgtAddr == nil {
 		// Unresolved UDP packet, return buffer to the pool

listener/sing/sing.go

@@ -24,7 +24,7 @@ const UDPTimeout = 5 * time.Minute
 
 type ListenerHandler struct {
 	TcpIn chan<- C.ConnContext
-	UdpIn chan<- *C.PacketAdapter
+	UdpIn chan<- C.PacketAdapter
 	Type  C.Type
 }
 

listener/sing_shadowsocks/server.go

@@ -32,7 +32,7 @@ type Listener struct {
 
 var _listener *Listener
 
-func New(config string, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) (C.AdvanceListener, error) {
+func New(config string, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) (C.AdvanceListener, error) {
 	addr, cipher, password, err := embedSS.ParseSSURL(config)
 	if err != nil {
 		return nil, err

listener/sing_tun/server.go

@@ -11,6 +11,7 @@ import (
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/iface"
 	C "github.com/Dreamacro/clash/constant"
+	LC "github.com/Dreamacro/clash/listener/config"
 	"github.com/Dreamacro/clash/listener/sing"
 	"github.com/Dreamacro/clash/log"
 
@@ -25,7 +26,7 @@ var InterfaceName = "Meta"
 
 type Listener struct {
 	closed  bool
-	options Tun
+	options LC.Tun
 	handler *ListenerHandler
 	tunName string
 
@@ -63,7 +64,7 @@ func CalculateInterfaceName(name string) (tunName string) {
 	return
 }
 
-func New(options Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) (l *Listener, err error) {
+func New(options LC.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) (l *Listener, err error) {
 	tunName := options.Device
 	if tunName == "" {
 		tunName = CalculateInterfaceName(InterfaceName)
@@ -161,12 +162,12 @@ func New(options Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter)
 	tunOptions := tun.Options{
 		Name:               tunName,
 		MTU:                tunMTU,
-		Inet4Address:       common.Map(options.Inet4Address, ListenPrefix.Build),
+		Inet4Address:       common.Map(options.Inet4Address, LC.ListenPrefix.Build),
-		Inet6Address:       common.Map(options.Inet6Address, ListenPrefix.Build),
+		Inet6Address:       common.Map(options.Inet6Address, LC.ListenPrefix.Build),
 		AutoRoute:          options.AutoRoute,
 		StrictRoute:        options.StrictRoute,
-		Inet4RouteAddress:  common.Map(options.Inet4RouteAddress, ListenPrefix.Build),
+		Inet4RouteAddress:  common.Map(options.Inet4RouteAddress, LC.ListenPrefix.Build),
-		Inet6RouteAddress:  common.Map(options.Inet6RouteAddress, ListenPrefix.Build),
+		Inet6RouteAddress:  common.Map(options.Inet6RouteAddress, LC.ListenPrefix.Build),
 		IncludeUID:         includeUID,
 		ExcludeUID:         excludeUID,
 		IncludeAndroidUser: options.IncludeAndroidUser,
@@ -282,6 +283,6 @@ func (l *Listener) Close() {
 	)
 }
 
-func (l *Listener) Config() Tun {
+func (l *Listener) Config() LC.Tun {
 	return l.options
 }

listener/sing_vmess/server.go

@@ -24,7 +24,7 @@ type Listener struct {
 
 var _listener *Listener
 
-func New(config string, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) (*Listener, error) {
+func New(config string, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) (*Listener, error) {
 	addr, username, password, err := parseVmessURL(config)
 	if err != nil {
 		return nil, err

listener/socks/udp.go

@@ -35,11 +35,11 @@ func (l *UDPListener) Close() error {
 	return l.packetConn.Close()
 }
 
-func NewUDP(addr string, in chan<- *C.PacketAdapter) (*UDPListener, error) {
+func NewUDP(addr string, in chan<- C.PacketAdapter) (*UDPListener, error) {
 	return NewUDPWithInfos(addr, "DEFAULT-SOCKS", "", in)
 }
 
-func NewUDPWithInfos(addr,name ,preferRulesName string, in chan<- *C.PacketAdapter) (*UDPListener, error) {
+func NewUDPWithInfos(addr, name, preferRulesName string, in chan<- C.PacketAdapter) (*UDPListener, error) {
 	l, err := net.ListenPacket("udp", addr)
 	if err != nil {
 		return nil, err
@@ -73,7 +73,7 @@ func NewUDPWithInfos(addr,name ,preferRulesName string, in chan<- *C.PacketAdapt
 	return sl, nil
 }
 
-func handleSocksUDP(name,preferRulesName string,pc net.PacketConn, in chan<- *C.PacketAdapter, buf []byte, addr net.Addr) {
+func handleSocksUDP(name, preferRulesName string, pc net.PacketConn, in chan<- C.PacketAdapter, buf []byte, addr net.Addr) {
 	target, payload, err := socks5.DecodeUDPPacket(buf)
 	if err != nil {
 		// Unresolved UDP packet, return buffer to the pool

listener/tproxy/udp.go

@@ -34,11 +34,11 @@ func (l *UDPListener) Close() error {
 	return l.packetConn.Close()
 }
 
-func NewUDP(addr string, in chan<- *C.PacketAdapter) (*UDPListener, error) {
+func NewUDP(addr string, in chan<- C.PacketAdapter) (*UDPListener, error) {
 	return NewUDPWithInfos(addr, "DEFAULT-TPROXY", "", in)
 }
 
-func NewUDPWithInfos(addr, name, preferRulesName string, in chan<- *C.PacketAdapter) (*UDPListener, error) {
+func NewUDPWithInfos(addr, name, preferRulesName string, in chan<- C.PacketAdapter) (*UDPListener, error) {
 	l, err := net.ListenPacket("udp", addr)
 	if err != nil {
 		return nil, err
@@ -90,7 +90,7 @@ func NewUDPWithInfos(addr, name, preferRulesName string, in chan<- *C.PacketAdap
 	return rl, nil
 }
 
-func handlePacketConn(name, preferRulesName string, pc net.PacketConn, in chan<- *C.PacketAdapter, buf []byte, lAddr, rAddr netip.AddrPort) {
+func handlePacketConn(name, preferRulesName string, pc net.PacketConn, in chan<- C.PacketAdapter, buf []byte, lAddr, rAddr netip.AddrPort) {
 	target := socks5.AddrFromStdAddrPort(rAddr)
 	pkt := &packet{
 		pc:    pc,

listener/tuic/server.go

@@ -2,47 +2,29 @@ package tuic
 
 import (
 	"crypto/tls"
-	"encoding/json"
 	"net"
 	"strings"
 	"time"
 
 	"github.com/metacubex/quic-go"
 
+	"github.com/Dreamacro/clash/adapter/inbound"
 	"github.com/Dreamacro/clash/common/sockopt"
 	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/adapter/inbound"
+	LC "github.com/Dreamacro/clash/listener/config"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/transport/socks5"
 	"github.com/Dreamacro/clash/transport/tuic"
 )
 
-type TuicServer struct {
-	Enable                bool
-	Listen                string
-	Token                 []string
-	Certificate           string
-	PrivateKey            string
-	CongestionController  string
-	MaxIdleTime           int
-	AuthenticationTimeout int
-	ALPN                  []string
-	MaxUdpRelayPacketSize int
-}
-
-func (t TuicServer) String() string {
-	b, _ := json.Marshal(t)
-	return string(b)
-}
-
 type Listener struct {
 	closed       bool
-	config       TuicServer
+	config       LC.TuicServer
 	udpListeners []net.PacketConn
 	servers      []*tuic.Server
 }
 
-func New(config TuicServer, tcpIn chan<- C.ConnContext, udpIn chan<- *C.PacketAdapter) (*Listener, error) {
+func New(config LC.TuicServer, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter) (*Listener, error) {
 	cert, err := tls.LoadX509KeyPair(config.Certificate, config.PrivateKey)
 	if err != nil {
 		return nil, err
@@ -140,6 +122,6 @@ func (l *Listener) Close() {
 	}
 }
 
-func (l *Listener) Config() TuicServer {
+func (l *Listener) Config() LC.TuicServer {
 	return l.config
 }

listener/tunnel/udp.go

@@ -34,7 +34,7 @@ func (l *PacketConn) Close() error {
 	return l.conn.Close()
 }
 
-func NewUDP(addr, target, proxy string, in chan<- *C.PacketAdapter) (*PacketConn, error) {
+func NewUDP(addr, target, proxy string, in chan<- C.PacketAdapter) (*PacketConn, error) {
 	l, err := net.ListenPacket("udp", addr)
 	if err != nil {
 		return nil, err
@@ -69,7 +69,7 @@ func NewUDP(addr, target, proxy string, in chan<- *C.PacketAdapter) (*PacketConn
 	return sl, nil
 }
 
-func (l *PacketConn) handleUDP(pc net.PacketConn, in chan<- *C.PacketAdapter, buf []byte, addr net.Addr) {
+func (l *PacketConn) handleUDP(pc net.PacketConn, in chan<- C.PacketAdapter, buf []byte, addr net.Addr) {
 	packet := &packet{
 		pc:      pc,
 		rAddr:   addr,

tunnel/tunnel.go

@@ -26,7 +26,7 @@ import (
 
 var (
 	tcpQueue       = make(chan C.ConnContext, 200)
-	udpQueue       = make(chan *C.PacketAdapter, 200)
+	udpQueue       = make(chan C.PacketAdapter, 200)
 	natTable       = nat.New()
 	rules          []C.Rule
 	subRules       map[string][]C.Rule
@@ -77,7 +77,7 @@ func TCPIn() chan<- C.ConnContext {
 }
 
 // UDPIn return fan-in udp queue
-func UDPIn() chan<- *C.PacketAdapter {
+func UDPIn() chan<- C.PacketAdapter {
 	return udpQueue
 }
 
@@ -217,7 +217,7 @@ func resolveMetadata(ctx C.PlainContext, metadata *C.Metadata) (proxy C.Proxy, r
 	return
 }
 
-func handleUDPConn(packet *C.PacketAdapter) {
+func handleUDPConn(packet C.PacketAdapter) {
 	metadata := packet.Metadata()
 	if !metadata.Valid() {
 		log.Warnln("[Metadata] not valid: %#v", metadata)
@@ -325,7 +325,7 @@ func handleUDPConn(packet *C.PacketAdapter) {
 		}
 
 		oAddr := metadata.DstIP
-		go handleUDPToLocal(packet.UDPPacket, pc, key, oAddr, fAddr)
+		go handleUDPToLocal(packet, pc, key, oAddr, fAddr)
 
 		natTable.Set(key, pc)
 		handle()