chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-08 11:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix naive padding (code style)

Browse Source
This commit is contained in:
arm64v8a 2022-09-07 10:51:50 +08:00
parent 53b15cca1b
commit 7819e6471b
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
inbound/naive.go
View File

@ -252,28 +252,26 @@ func (c *naivePaddingConn) read(p []byte) (n int, err error) {
} }
if c.readPadding < kFirstPaddings { if c.readPadding < kFirstPaddings {
c.readPadding++ c.readPadding++
nr, err := io.ReadFull(c.reader, p[0:3]) n, err = io.ReadFull(c.reader, p[0:3])
if nr > 0 { if n > 0 {
nr = int(p[0])*256 + int(p[1]) n = int(binary.BigEndian.Uint16(p[0:2]))
paddingSize := int(p[2]) paddingSize := int(p[2])
if nr > len(p) { // If buffer is too small, set remaining.
c.readRemaining = nr - len(p) if n > len(p) {
c.readRemaining = n - len(p)
c.paddingRemaining = paddingSize c.paddingRemaining = paddingSize
nr = len(p) n = len(p)
paddingSize = 0 paddingSize = 0
} }
nr, err = io.ReadFull(c.reader, p[0:nr]) n, err = io.ReadFull(c.reader, p[0:n])
if nr > 0 && paddingSize > 0 { if n > 0 && paddingSize > 0 {
var junk [256]byte var junk [256]byte
_, err = io.ReadFull(c.reader, junk[0:paddingSize]) _, err = io.ReadFull(c.reader, junk[0:paddingSize])
} }
} }
if err != nil { return
return 0, err
}
return nr, nil
} }
return c.reader.Read(p) return c.reader.Read(p)
} }
@ -318,7 +316,7 @@ func (c *naivePaddingConn) write(p []byte) (n int, err error) {
_, err = c.writer.Write(p) _, err = c.writer.Write(p)
if err != nil { if err != nil {
return 0, err return
} }
return len(p), nil return len(p), nil
} }