diff --git a/common/buf/buffer.go b/common/buf/buffer.go index fe8e0cb..d0f4ba4 100644 --- a/common/buf/buffer.go +++ b/common/buf/buffer.go @@ -11,8 +11,6 @@ import ( E "github.com/sagernet/sing/common/exceptions" ) -const ReversedHeader = 1024 - type Buffer struct { data []byte start int @@ -25,8 +23,6 @@ type Buffer struct { func New() *Buffer { return &Buffer{ data: Get(BufferSize), - start: ReversedHeader, - end: ReversedHeader, managed: true, } } @@ -34,8 +30,6 @@ func New() *Buffer { func NewPacket() *Buffer { return &Buffer{ data: Get(UDPBufferSize), - start: ReversedHeader, - end: ReversedHeader, managed: true, } } @@ -277,15 +271,15 @@ func (b *Buffer) Resize(start, end int) { } func (b *Buffer) Reset() { - b.start = ReversedHeader - b.end = ReversedHeader -} - -func (b *Buffer) FullReset() { b.start = 0 b.end = 0 } +// Deprecated: use Reset instead. +func (b *Buffer) FullReset() { + b.Reset() +} + func (b *Buffer) IncRef() { atomic.AddInt32(&b.refs, 1) } diff --git a/common/bufio/buffer.go b/common/bufio/buffer.go index 47c35a9..cdd2896 100644 --- a/common/bufio/buffer.go +++ b/common/bufio/buffer.go @@ -37,7 +37,7 @@ func (w *BufferedWriter) Write(p []byte) (n int, err error) { if err != nil { return } - w.buffer.FullReset() + w.buffer.Reset() } } diff --git a/common/bufio/chunk.go b/common/bufio/chunk.go index 56a733a..cd11f63 100644 --- a/common/bufio/chunk.go +++ b/common/bufio/chunk.go @@ -30,7 +30,7 @@ func (c *ChunkReader) ReadBuffer(buffer *buf.Buffer) error { } else if !c.cache.IsEmpty() { return common.Error(buffer.ReadFrom(c.cache)) } - c.cache.FullReset() + c.cache.Reset() err := c.upstream.ReadBuffer(c.cache) if err != nil { c.cache.Release() @@ -46,7 +46,7 @@ func (c *ChunkReader) Read(p []byte) (n int, err error) { } else if !c.cache.IsEmpty() { return c.cache.Read(p) } - c.cache.FullReset() + c.cache.Reset() err = c.upstream.ReadBuffer(c.cache) if err != nil { c.cache.Release() @@ -70,7 +70,7 @@ func (c *ChunkReader) ReadChunk() (*buf.Buffer, error) { } else if !c.cache.IsEmpty() { return c.cache, nil } - c.cache.FullReset() + c.cache.Reset() err := c.upstream.ReadBuffer(c.cache) if err != nil { c.cache.Release() diff --git a/common/uot/server.go b/common/uot/server.go index 78cfa6d..57dfc38 100644 --- a/common/uot/server.go +++ b/common/uot/server.go @@ -77,7 +77,7 @@ func (c *ServerConn) loopInput() { if err != nil { break } - buffer.FullReset() + buffer.Reset() _, err = buffer.ReadFullFrom(c.inputReader, int(length)) if err != nil { break @@ -95,7 +95,7 @@ func (c *ServerConn) loopOutput() { buffer := buf.NewPacket() defer buffer.Release() for { - buffer.FullReset() + buffer.Reset() n, addr, err := buffer.ReadPacketFrom(c) if err != nil { break