File tree 4 files changed +10
-16
lines changed
4 files changed +10
-16
lines changed Original file line number Diff line number Diff line change @@ -11,8 +11,6 @@ import (
11
11
E "github.com/sagernet/sing/common/exceptions"
12
12
)
13
13
14
- const ReversedHeader = 1024
15
-
16
14
type Buffer struct {
17
15
data []byte
18
16
start int
@@ -25,17 +23,13 @@ type Buffer struct {
25
23
func New () * Buffer {
26
24
return & Buffer {
27
25
data : Get (BufferSize ),
28
- start : ReversedHeader ,
29
- end : ReversedHeader ,
30
26
managed : true ,
31
27
}
32
28
}
33
29
34
30
func NewPacket () * Buffer {
35
31
return & Buffer {
36
32
data : Get (UDPBufferSize ),
37
- start : ReversedHeader ,
38
- end : ReversedHeader ,
39
33
managed : true ,
40
34
}
41
35
}
@@ -277,13 +271,13 @@ func (b *Buffer) Resize(start, end int) {
277
271
}
278
272
279
273
func (b * Buffer ) Reset () {
280
- b .start = ReversedHeader
281
- b .end = ReversedHeader
274
+ b .start = 0
275
+ b .end = 0
282
276
}
283
277
278
+ // Deprecated: use Reset instead.
284
279
func (b * Buffer ) FullReset () {
285
- b .start = 0
286
- b .end = 0
280
+ b .Reset ()
287
281
}
288
282
289
283
func (b * Buffer ) IncRef () {
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ func (w *BufferedWriter) Write(p []byte) (n int, err error) {
37
37
if err != nil {
38
38
return
39
39
}
40
- w .buffer .FullReset ()
40
+ w .buffer .Reset ()
41
41
}
42
42
}
43
43
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ func (c *ChunkReader) ReadBuffer(buffer *buf.Buffer) error {
30
30
} else if ! c .cache .IsEmpty () {
31
31
return common .Error (buffer .ReadFrom (c .cache ))
32
32
}
33
- c .cache .FullReset ()
33
+ c .cache .Reset ()
34
34
err := c .upstream .ReadBuffer (c .cache )
35
35
if err != nil {
36
36
c .cache .Release ()
@@ -46,7 +46,7 @@ func (c *ChunkReader) Read(p []byte) (n int, err error) {
46
46
} else if ! c .cache .IsEmpty () {
47
47
return c .cache .Read (p )
48
48
}
49
- c .cache .FullReset ()
49
+ c .cache .Reset ()
50
50
err = c .upstream .ReadBuffer (c .cache )
51
51
if err != nil {
52
52
c .cache .Release ()
@@ -70,7 +70,7 @@ func (c *ChunkReader) ReadChunk() (*buf.Buffer, error) {
70
70
} else if ! c .cache .IsEmpty () {
71
71
return c .cache , nil
72
72
}
73
- c .cache .FullReset ()
73
+ c .cache .Reset ()
74
74
err := c .upstream .ReadBuffer (c .cache )
75
75
if err != nil {
76
76
c .cache .Release ()
Original file line number Diff line number Diff line change @@ -77,7 +77,7 @@ func (c *ServerConn) loopInput() {
77
77
if err != nil {
78
78
break
79
79
}
80
- buffer .FullReset ()
80
+ buffer .Reset ()
81
81
_ , err = buffer .ReadFullFrom (c .inputReader , int (length ))
82
82
if err != nil {
83
83
break
@@ -95,7 +95,7 @@ func (c *ServerConn) loopOutput() {
95
95
buffer := buf .NewPacket ()
96
96
defer buffer .Release ()
97
97
for {
98
- buffer .FullReset ()
98
+ buffer .Reset ()
99
99
n , addr , err := buffer .ReadPacketFrom (c )
100
100
if err != nil {
101
101
break
You can’t perform that action at this time.
0 commit comments