other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 20:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup sing buffer usage

This commit is contained in:
H1JK 2023-12-15 23:45:41 +08:00 committed by yuhan6665
parent 38b175d53e
commit c01a30e8f4
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -12,7 +12,7 @@ require (
github.com/pires/go-proxyproto v0.7.0 github.com/pires/go-proxyproto v0.7.0
github.com/quic-go/quic-go v0.40.1 github.com/quic-go/quic-go v0.40.1
github.com/refraction-networking/utls v1.5.4 github.com/refraction-networking/utls v1.5.4
github.com/sagernet/sing v0.2.19 github.com/sagernet/sing v0.3.0-beta.2
github.com/sagernet/sing-shadowsocks v0.2.6 github.com/sagernet/sing-shadowsocks v0.2.6
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb
github.com/stretchr/testify v1.8.4 github.com/stretchr/testify v1.8.4

4
go.sum
View File

@ -125,8 +125,8 @@ github.com/refraction-networking/utls v1.5.4/go.mod h1:SPuDbBmgLGp8s+HLNc83Fuavw
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg= github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s= github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/sagernet/sing v0.2.19 h1:Mdj/YJ5TtEyG+eIZaAlvX8j2cHxMN6eW4RF6Xh9iWyg= github.com/sagernet/sing v0.3.0-beta.2 h1:7wqgP+cMQeHS3M/64WWvJLeX07fLctBkE4+lguAFWeU=
github.com/sagernet/sing v0.2.19/go.mod h1:Ce5LNojQOgOiWhiD8pPD6E9H7e2KgtOe3Zxx4Ou5u80= github.com/sagernet/sing v0.3.0-beta.2/go.mod h1:9pfuAH6mZfgnz/YjP6xu5sxx882rfyjpcrTdUpd6w3g=
github.com/sagernet/sing-shadowsocks v0.2.6 h1:xr7ylAS/q1cQYS8oxKKajhuQcchd5VJJ4K4UZrrpp0s= github.com/sagernet/sing-shadowsocks v0.2.6 h1:xr7ylAS/q1cQYS8oxKKajhuQcchd5VJJ4K4UZrrpp0s=
github.com/sagernet/sing-shadowsocks v0.2.6/go.mod h1:j2YZBIpWIuElPFL/5sJAj470bcn/3QQ5lxZUNKLDNAM= github.com/sagernet/sing-shadowsocks v0.2.6/go.mod h1:j2YZBIpWIuElPFL/5sJAj470bcn/3QQ5lxZUNKLDNAM=
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U= github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=

2
proxy/shadowsocks_2022/inbound.go
View File

@ -88,13 +88,13 @@ func (i *Inbound) Process(ctx context.Context, network net.Network, connection s
} }
for _, buffer := range mb { for _, buffer := range mb {
packet := B.As(buffer.Bytes()).ToOwned() packet := B.As(buffer.Bytes()).ToOwned()
buffer.Release()
err = i.service.NewPacket(ctx, pc, packet, metadata) err = i.service.NewPacket(ctx, pc, packet, metadata)
if err != nil { if err != nil {
packet.Release() packet.Release()
buf.ReleaseMulti(mb) buf.ReleaseMulti(mb)
return err return err
} }
buffer.Release()
} }
} }
} }

2
proxy/shadowsocks_2022/inbound_multi.go
View File

@ -177,13 +177,13 @@ func (i *MultiUserInbound) Process(ctx context.Context, network net.Network, con
} }
for _, buffer := range mb { for _, buffer := range mb {
packet := B.As(buffer.Bytes()).ToOwned() packet := B.As(buffer.Bytes()).ToOwned()
buffer.Release()
err = i.service.NewPacket(ctx, pc, packet, metadata) err = i.service.NewPacket(ctx, pc, packet, metadata)
if err != nil { if err != nil {
packet.Release() packet.Release()
buf.ReleaseMulti(mb) buf.ReleaseMulti(mb)
return err return err
} }
buffer.Release()
} }
} }
} }

2
proxy/shadowsocks_2022/inbound_relay.go
View File

@ -109,13 +109,13 @@ func (i *RelayInbound) Process(ctx context.Context, network net.Network, connect
} }
for _, buffer := range mb { for _, buffer := range mb {
packet := B.As(buffer.Bytes()).ToOwned() packet := B.As(buffer.Bytes()).ToOwned()
buffer.Release()
err = i.service.NewPacket(ctx, pc, packet, metadata) err = i.service.NewPacket(ctx, pc, packet, metadata)
if err != nil { if err != nil {
packet.Release() packet.Release()
buf.ReleaseMulti(mb) buf.ReleaseMulti(mb)
return err return err
} }
buffer.Release()
} }
} }
} }

13
proxy/shadowsocks_2022/outbound.go
View File

@ -2,7 +2,6 @@ package shadowsocks_2022
import ( import (
"context" "context"
"runtime"
"time" "time"
shadowsocks "github.com/sagernet/sing-shadowsocks" shadowsocks "github.com/sagernet/sing-shadowsocks"
@ -102,27 +101,25 @@ func (o *Outbound) Process(ctx context.Context, link *transport.Link, dialer int
if err != nil && err != buf.ErrNotTimeoutReader && err != buf.ErrReadTimeout { if err != nil && err != buf.ErrNotTimeoutReader && err != buf.ErrReadTimeout {
return newError("read payload").Base(err) return newError("read payload").Base(err)
} }
_payload := B.New() payload := B.New()
payload := C.Dup(_payload)
defer payload.Release()
for { for {
payload.FullReset() payload.Reset()
nb, n := buf.SplitBytes(mb, payload.FreeBytes()) nb, n := buf.SplitBytes(mb, payload.FreeBytes())
if n > 0 { if n > 0 {
payload.Truncate(n) payload.Truncate(n)
_, err = serverConn.Write(payload.Bytes()) _, err = serverConn.Write(payload.Bytes())
if err != nil { if err != nil {
payload.Release()
return newError("write payload").Base(err) return newError("write payload").Base(err)
} }
handshake = true handshake = true
} }
if nb.IsEmpty() { if nb.IsEmpty() {
break break
} else { }
mb = nb mb = nb
} }
} payload.Release()
runtime.KeepAlive(_payload)
} }
if !handshake { if !handshake {
_, err = serverConn.Write(nil) _, err = serverConn.Write(nil)