mirror of
https://github.com/MetaCubeX/mihomo.git
synced 2024-11-16 11:42:43 +08:00
chore: better sing's udp api support
This commit is contained in:
parent
1a9104c003
commit
8b631f11b8
|
@ -18,6 +18,9 @@ func NewEnhancePacketConn(pc net.PacketConn) EnhancePacketConn {
|
||||||
if enhancePC, isEnhancePC := pc.(EnhancePacketConn); isEnhancePC {
|
if enhancePC, isEnhancePC := pc.(EnhancePacketConn); isEnhancePC {
|
||||||
return enhancePC
|
return enhancePC
|
||||||
}
|
}
|
||||||
|
if singPC, isSingPC := pc.(SingPacketConn); isSingPC {
|
||||||
|
return newEnhanceSingPacketConn(singPC)
|
||||||
|
}
|
||||||
return &enhancePacketConn{PacketConn: pc}
|
return &enhancePacketConn{PacketConn: pc}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
74
common/net/packet/packet_sing.go
Normal file
74
common/net/packet/packet_sing.go
Normal file
|
@ -0,0 +1,74 @@
|
||||||
|
package packet
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
|
||||||
|
"github.com/sagernet/sing/common/buf"
|
||||||
|
"github.com/sagernet/sing/common/bufio"
|
||||||
|
M "github.com/sagernet/sing/common/metadata"
|
||||||
|
N "github.com/sagernet/sing/common/network"
|
||||||
|
)
|
||||||
|
|
||||||
|
type SingPacketConn = N.NetPacketConn
|
||||||
|
|
||||||
|
type enhanceSingPacketConn struct {
|
||||||
|
N.NetPacketConn
|
||||||
|
readWaiter N.PacketReadWaiter
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *enhanceSingPacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
|
||||||
|
var buff *buf.Buffer
|
||||||
|
var dest M.Socksaddr
|
||||||
|
newBuffer := func() *buf.Buffer {
|
||||||
|
buff = buf.NewPacket() // do not use stack buffer
|
||||||
|
return buff
|
||||||
|
}
|
||||||
|
if c.readWaiter != nil {
|
||||||
|
c.readWaiter.InitializeReadWaiter(newBuffer)
|
||||||
|
defer c.readWaiter.InitializeReadWaiter(nil)
|
||||||
|
dest, err = c.readWaiter.WaitReadPacket()
|
||||||
|
} else {
|
||||||
|
dest, err = c.NetPacketConn.ReadPacket(newBuffer())
|
||||||
|
}
|
||||||
|
if dest.IsFqdn() {
|
||||||
|
addr = dest
|
||||||
|
} else {
|
||||||
|
addr = dest.UDPAddr()
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
if buff != nil {
|
||||||
|
buff.Release()
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if buff == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if buff.IsEmpty() {
|
||||||
|
buff.Release()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data = buff.Bytes()
|
||||||
|
put = buff.Release
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *enhanceSingPacketConn) Upstream() any {
|
||||||
|
return c.NetPacketConn
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *enhanceSingPacketConn) WriterReplaceable() bool {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *enhanceSingPacketConn) ReaderReplaceable() bool {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func newEnhanceSingPacketConn(conn N.NetPacketConn) *enhanceSingPacketConn {
|
||||||
|
epc := &enhanceSingPacketConn{NetPacketConn: conn}
|
||||||
|
if readWaiter, isReadWaiter := bufio.CreatePacketReadWaiter(conn); isReadWaiter {
|
||||||
|
epc.readWaiter = readWaiter
|
||||||
|
}
|
||||||
|
return epc
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user