Skip to content

Commit a9668cd

Browse files
committed
Remove legacy buffer header
1 parent 2fe9517 commit a9668cd

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

common/buf/buffer.go

+4-10
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
E "github.com/sagernet/sing/common/exceptions"
1212
)
1313

14-
const ReversedHeader = 1024
15-
1614
type Buffer struct {
1715
data []byte
1816
start int
@@ -25,17 +23,13 @@ type Buffer struct {
2523
func New() *Buffer {
2624
return &Buffer{
2725
data: Get(BufferSize),
28-
start: ReversedHeader,
29-
end: ReversedHeader,
3026
managed: true,
3127
}
3228
}
3329

3430
func NewPacket() *Buffer {
3531
return &Buffer{
3632
data: Get(UDPBufferSize),
37-
start: ReversedHeader,
38-
end: ReversedHeader,
3933
managed: true,
4034
}
4135
}
@@ -277,13 +271,13 @@ func (b *Buffer) Resize(start, end int) {
277271
}
278272

279273
func (b *Buffer) Reset() {
280-
b.start = ReversedHeader
281-
b.end = ReversedHeader
274+
b.start = 0
275+
b.end = 0
282276
}
283277

278+
// Deprecated: use Reset instead.
284279
func (b *Buffer) FullReset() {
285-
b.start = 0
286-
b.end = 0
280+
b.Reset()
287281
}
288282

289283
func (b *Buffer) IncRef() {

common/bufio/buffer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (w *BufferedWriter) Write(p []byte) (n int, err error) {
3737
if err != nil {
3838
return
3939
}
40-
w.buffer.FullReset()
40+
w.buffer.Reset()
4141
}
4242
}
4343

common/bufio/chunk.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (c *ChunkReader) ReadBuffer(buffer *buf.Buffer) error {
3030
} else if !c.cache.IsEmpty() {
3131
return common.Error(buffer.ReadFrom(c.cache))
3232
}
33-
c.cache.FullReset()
33+
c.cache.Reset()
3434
err := c.upstream.ReadBuffer(c.cache)
3535
if err != nil {
3636
c.cache.Release()
@@ -46,7 +46,7 @@ func (c *ChunkReader) Read(p []byte) (n int, err error) {
4646
} else if !c.cache.IsEmpty() {
4747
return c.cache.Read(p)
4848
}
49-
c.cache.FullReset()
49+
c.cache.Reset()
5050
err = c.upstream.ReadBuffer(c.cache)
5151
if err != nil {
5252
c.cache.Release()
@@ -70,7 +70,7 @@ func (c *ChunkReader) ReadChunk() (*buf.Buffer, error) {
7070
} else if !c.cache.IsEmpty() {
7171
return c.cache, nil
7272
}
73-
c.cache.FullReset()
73+
c.cache.Reset()
7474
err := c.upstream.ReadBuffer(c.cache)
7575
if err != nil {
7676
c.cache.Release()

common/uot/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (c *ServerConn) loopInput() {
7777
if err != nil {
7878
break
7979
}
80-
buffer.FullReset()
80+
buffer.Reset()
8181
_, err = buffer.ReadFullFrom(c.inputReader, int(length))
8282
if err != nil {
8383
break
@@ -95,7 +95,7 @@ func (c *ServerConn) loopOutput() {
9595
buffer := buf.NewPacket()
9696
defer buffer.Release()
9797
for {
98-
buffer.FullReset()
98+
buffer.Reset()
9999
n, addr, err := buffer.ReadPacketFrom(c)
100100
if err != nil {
101101
break

0 commit comments

Comments
 (0)