xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "chore: reduce memory alloc"

Browse source 
This reverts commit a6b816b1c6.
This commit is contained in:
Larvan2 2023-11-22 19:22:15 +08:00
parent 6a3e28c384
commit 8b4499e461
3 changed files with 37 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
adapter/outbound/reject.go
View file

@ -23,9 +23,7 @@ type RejectOption struct {
// DialContext implements C.ProxyAdapter
func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
if r.drop {
c, _ := net.Pipe()
_ = c.SetDeadline(time.Now().Add(C.DefaultDropTime))
return NewConn(c, r), nil
return NewConn(dropConn{}, r), nil
}
return NewConn(nopConn{}, r), nil
}
@ -33,11 +31,7 @@ func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata, opts ...
// ListenPacketContext implements C.ProxyAdapter
func (r *Reject) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
if r.drop {
c, _ := net.Pipe()
_ = c.SetDeadline(time.Now().Add(C.DefaultDropTime))
pc := newDropPacketConnWrapper(c)
return newPacketConn(pc, r), nil
return newPacketConn(&dropPacketConn{}, r), nil
}
return newPacketConn(&nopPacketConn{}, r), nil
}
@ -105,8 +99,12 @@ var udpAddrIPv4Unspecified = &net.UDPAddr{IP: net.IPv4zero, Port: 0}
type nopPacketConn struct{}
func (npc nopPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) { return len(b), nil }
func (npc nopPacketConn) ReadFrom(b []byte) (int, net.Addr, error) { return 0, nil, io.EOF }
func (npc nopPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
return len(b), nil
}
func (npc nopPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
return 0, nil, io.EOF
}
func (npc nopPacketConn) WaitReadFrom() ([]byte, func(), net.Addr, error) {
return nil, nil, nil, io.EOF
}
@ -116,25 +114,37 @@ func (npc nopPacketConn) SetDeadline(time.Time) error { return nil }
func (npc nopPacketConn) SetReadDeadline(time.Time) error { return nil }
func (npc nopPacketConn) SetWriteDeadline(time.Time) error { return nil }
type dropPacketConn struct {
conn net.Conn
}
type dropConn struct{}
func newDropPacketConnWrapper(conn net.Conn) net.PacketConn {
return &dropPacketConn{conn}
func (rw dropConn) Read(b []byte) (int, error) { return 0, io.EOF }
func (rw dropConn) ReadBuffer(buffer *buf.Buffer) error {
time.Sleep(C.DefaultDropTime)
return io.EOF
}
func (dpc dropPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
func (rw dropConn) Write(b []byte) (int, error) { return 0, io.EOF }
func (rw dropConn) WriteBuffer(buffer *buf.Buffer) error { return io.EOF }
func (rw dropConn) Close() error { return nil }
func (rw dropConn) LocalAddr() net.Addr { return nil }
func (rw dropConn) RemoteAddr() net.Addr { return nil }
func (rw dropConn) SetDeadline(time.Time) error { return nil }
func (rw dropConn) SetReadDeadline(time.Time) error { return nil }
func (rw dropConn) SetWriteDeadline(time.Time) error { return nil }
type dropPacketConn struct{}
func (npc dropPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
time.Sleep(C.DefaultDropTime)
return len(b), nil
}
func (dpc dropPacketConn) ReadFrom(b []byte) (int, net.Addr, error) { return 0, nil, io.EOF }
func (dpc dropPacketConn) WaitReadFrom() ([]byte, func(), net.Addr, error) {
func (npc dropPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
time.Sleep(C.DefaultDropTime)
return 0, nil, io.EOF
}
func (npc dropPacketConn) WaitReadFrom() ([]byte, func(), net.Addr, error) {
return nil, nil, nil, io.EOF
}
func (dpc dropPacketConn) Close() error {
dpc.conn = nil
return nil
}
func (dpc dropPacketConn) LocalAddr() net.Addr { return udpAddrIPv4Unspecified }
func (dpc dropPacketConn) SetDeadline(time.Time) error { return nil }
func (dpc dropPacketConn) SetReadDeadline(time.Time) error { return nil }
func (dpc dropPacketConn) SetWriteDeadline(time.Time) error { return nil }
func (npc dropPacketConn) Close() error { return nil }
func (npc dropPacketConn) LocalAddr() net.Addr { return udpAddrIPv4Unspecified }
func (npc dropPacketConn) SetDeadline(time.Time) error { return nil }
func (npc dropPacketConn) SetReadDeadline(time.Time) error { return nil }
func (npc dropPacketConn) SetWriteDeadline(time.Time) error { return nil }

2
constant/adapters.go
View file

@ -44,7 +44,7 @@ const (
const (
DefaultTCPTimeout = 5 * time.Second
DefaultDropTime = 30 * time.Second
DefaultDropTime = 12 * DefaultTCPTimeout
DefaultUDPTimeout = DefaultTCPTimeout
DefaultTLSTimeout = DefaultTCPTimeout
DefaultMaxHealthCheckUrlNum = 16

1
listener/sing/sing.go
View file

@ -129,7 +129,6 @@ func (h *ListenerHandler) NewPacketConnection(ctx context.Context, conn network.
conn2 = nil
}()
var buff *buf.Buffer
defer buff.Release()
newBuffer := func() *buf.Buffer {
buff = buf.NewPacket() // do not use stack buffer
return buff