From 7e2246907b97efd98bf7623e65f7800eb1b0dd22 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Wed, 19 Apr 2017 11:52:27 +0200
Subject: [PATCH] refactor bytes reader

---
 common/buf/reader.go | 81 ++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 48 deletions(-)

diff --git a/common/buf/reader.go b/common/buf/reader.go
index 88dbab193..6e0fed65e 100644
--- a/common/buf/reader.go
+++ b/common/buf/reader.go
@@ -36,74 +36,59 @@ func (r *readerAdpater) Read() (MultiBuffer, error) {
 }
 
 type bufferToBytesReader struct {
-	stream  Reader
-	current MultiBuffer
-	err     error
-}
-
-// fill fills in the internal buffer.
-func (r *bufferToBytesReader) fill() {
-	b, err := r.stream.Read()
-	if err != nil {
-		r.err = err
-		return
-	}
-	r.current = b
+	stream   Reader
+	leftOver MultiBuffer
 }
 
 func (r *bufferToBytesReader) Read(b []byte) (int, error) {
-	if r.err != nil {
-		return 0, r.err
+	if r.leftOver != nil {
+		nBytes, err := r.leftOver.Read(b)
+		if r.leftOver.IsEmpty() {
+			r.leftOver.Release()
+			r.leftOver = nil
+		}
+		return nBytes, err
 	}
 
-	if r.current == nil {
-		r.fill()
-		if r.err != nil {
-			return 0, r.err
-		}
+	mb, err := r.stream.Read()
+	if err != nil {
+		return 0, err
 	}
-	nBytes, err := r.current.Read(b)
-	if r.current.IsEmpty() {
-		r.current.Release()
-		r.current = nil
+
+	nBytes, err := mb.Read(b)
+	if !mb.IsEmpty() {
+		r.leftOver = mb
 	}
 	return nBytes, err
 }
 
 func (r *bufferToBytesReader) ReadMultiBuffer() (MultiBuffer, error) {
-	if r.err != nil {
-		return nil, r.err
+	if r.leftOver != nil {
+		mb := r.leftOver
+		r.leftOver = nil
+		return mb, nil
 	}
-	if r.current == nil {
-		r.fill()
-		if r.err != nil {
-			return nil, r.err
-		}
-	}
-	b := r.current
-	r.current = nil
-	return b, nil
+
+	return r.stream.Read()
 }
 
 func (r *bufferToBytesReader) writeToInternal(writer io.Writer) (int64, error) {
-	if r.err != nil {
-		return 0, r.err
-	}
-
 	mbWriter := NewWriter(writer)
 	totalBytes := int64(0)
+	if r.leftOver != nil {
+		mbWriter.Write(r.leftOver)
+		totalBytes += int64(r.leftOver.Len())
+	}
+
 	for {
-		if r.current == nil {
-			r.fill()
-			if r.err != nil {
-				return totalBytes, r.err
-			}
-		}
-		totalBytes += int64(r.current.Len())
-		if err := mbWriter.Write(r.current); err != nil {
+		mb, err := r.stream.Read()
+		if err != nil {
+			return totalBytes, err
+		}
+		totalBytes += int64(mb.Len())
+		if err := mbWriter.Write(mb); err != nil {
 			return totalBytes, err
 		}
-		r.current = nil
 	}
 }