lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-10-01 16:26:02 -04:00
Code Issues Releases Wiki Activity

fix chunk stream reader

Browse Source
This commit is contained in:
Darien Raymond 2017-04-28 20:11:44 +02:00
parent bd8239f12d
commit 6239647336
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/crypto/chunk.go
View File

@ -48,27 +48,26 @@ func NewChunkStreamReader(sizeDecoder ChunkSizeDecoder, reader io.Reader) *Chunk
} }
} }
func (r *ChunkStreamReader) readAtLeast(size int) (buf.MultiBuffer, error) { func (r *ChunkStreamReader) readAtLeast(size int) error {
mb := r.leftOver mb := r.leftOver
for mb.Len() < size { for mb.Len() < size {
extra, err := r.reader.Read() extra, err := r.reader.Read()
if err != nil { if err != nil {
mb.Release() mb.Release()
return nil, err return err
} }
mb.AppendMulti(extra) mb.AppendMulti(extra)
} }
r.leftOver = mb
return mb, nil return nil
} }
func (r *ChunkStreamReader) readSize() (uint16, error) { func (r *ChunkStreamReader) readSize() (uint16, error) {
if r.sizeDecoder.SizeBytes() > r.leftOver.Len() { if r.sizeDecoder.SizeBytes() > r.leftOver.Len() {
mb, err := r.readAtLeast(r.sizeDecoder.SizeBytes() - r.leftOver.Len()) if err := r.readAtLeast(r.sizeDecoder.SizeBytes() - r.leftOver.Len()); err != nil {
if err != nil {
return 0, err return 0, err
} }
r.leftOver.AppendMulti(mb)
} }
r.leftOver.Read(r.buffer) r.leftOver.Read(r.buffer)
return r.sizeDecoder.Decode(r.buffer) return r.sizeDecoder.Decode(r.buffer)
@ -87,29 +86,26 @@ func (r *ChunkStreamReader) Read() (buf.MultiBuffer, error) {
size = int(nextSize) size = int(nextSize)
} }
leftOver := r.leftOver if r.leftOver.IsEmpty() {
if leftOver.IsEmpty() { if err := r.readAtLeast(1); err != nil {
mb, err := r.readAtLeast(1)
if err != nil {
return nil, err return nil, err
} }
leftOver = mb
} }
if size >= leftOver.Len() { if size >= r.leftOver.Len() {
r.leftOverSize = uint16(size - leftOver.Len()) mb := r.leftOver
r.leftOverSize = uint16(size - r.leftOver.Len())
r.leftOver = nil r.leftOver = nil
return leftOver, nil return mb, nil
} }
mb := leftOver.SliceBySize(size) mb := r.leftOver.SliceBySize(size)
if mb.Len() != size { if mb.Len() != size {
b := buf.New() b := buf.New()
b.AppendSupplier(buf.ReadFullFrom(&leftOver, size-mb.Len())) b.AppendSupplier(buf.ReadFullFrom(&r.leftOver, size-mb.Len()))
mb.Append(b) mb.Append(b)
} }
r.leftOver = leftOver
r.leftOverSize = 0 r.leftOverSize = 0
return mb, nil return mb, nil
} }