do some fix

Author: Fangliding

common/buf/copy.go

@@ -1,6 +1,7 @@
 package buf
 
 import (
+	"fmt"
 	"io"
 	"sync"
 	"time"
@@ -116,8 +117,8 @@ func Copy(reader Reader, writer Writer, options ...CopyOption) error {
 		option(&handler)
 	}
 	var err error
-	if sReader, ok := reader.(*SingleReader); ok && false {
-		err = copyV(sReader, writer, &handler)
+	if gReader, ok := reader.(*GatherableReader); ok {
+		err = copyV(gReader, writer, &handler)
 	} else {
 		err = copyInternal(reader, writer, &handler)
 	}
@@ -141,7 +142,7 @@ func CopyOnceTimeout(reader Reader, writer Writer, timeout time.Duration) error
 	return writer.WriteMultiBuffer(mb)
 }
 
-func copyV(r *SingleReader, w Writer, handler *copyHandler) error {
+func copyV(r *GatherableReader, w Writer, handler *copyHandler) error {
 	// channel buffer size is maxBuffer/maxPerPacketLen (ignore the case of many small packets)
 	// default buffer size:
 	// 0 in ARM MIPS MIPSLE
@@ -162,6 +163,7 @@ func copyV(r *SingleReader, w Writer, handler *copyHandler) error {
 		defer wg.Done()
 		defer close(cache)
 		for {
+			fmt.Println("read")
 			b, err := r.readBuffer()
 			if err == nil {
 				select {

common/buf/io.go

@@ -144,6 +144,27 @@ func NewReader(reader io.Reader) Reader {
 	}
 }
 
+type GatherableReader struct {
+	io.Reader
+}
+
+func (r *GatherableReader) ReadMultiBuffer() (MultiBuffer, error) {
+	b, err := ReadBuffer(r.Reader)
+	return MultiBuffer{b}, err
+}
+
+func (r *GatherableReader) readBuffer() (*Buffer, error) {
+	b, err := ReadBuffer(r.Reader)
+	return b, err
+}
+
+// GatherableReader is like SingleReader but will be automatically gathered and use writev in buf.Copy().
+func NewGatherableReader(reader io.Reader) *GatherableReader {
+	return &GatherableReader{
+		Reader: reader,
+	}
+}
+
 // NewPacketReader creates a new PacketReader based on the given reader.
 func NewPacketReader(reader io.Reader) Reader {
 	if mr, ok := reader.(Reader); ok {

common/buf/reader.go

@@ -159,11 +159,6 @@ func (r *SingleReader) ReadMultiBuffer() (MultiBuffer, error) {
 	return MultiBuffer{b}, err
 }
 
-func (r *SingleReader) readBuffer() (*Buffer, error) {
-	b, err := ReadBuffer(r.Reader)
-	return b, err
-}
-
 // PacketReader is a Reader that read one Buffer every time.
 type PacketReader struct {
 	io.Reader

proxy/vless/inbound/inbound.go

@@ -291,7 +291,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
 	errors.LogInfo(ctx, "firstLen = ", firstLen)
 
 	reader := &buf.BufferedReader{
-		Reader: buf.NewReader(connection),
+		Reader: buf.NewGatherableReader(connection),
 		Buffer: buf.MultiBuffer{first},
 	}