Massive fixes

proxy/vmess/inbound/inbound.go

@@ -143,9 +143,8 @@ func (this *VMessInboundHandler) HandleConnection(connection *hub.Connection) {
 	defer input.Close()
 	defer output.Release()
 
-	var readFinish, writeFinish sync.Mutex
+	var readFinish sync.Mutex
 	readFinish.Lock()
-	writeFinish.Lock()
 
 	userSettings := protocol.GetUserSettings(request.User.Level)
 	connReader.SetTimeOut(userSettings.PayloadReadTimeout)
@@ -177,27 +176,21 @@ func (this *VMessInboundHandler) HandleConnection(connection *hub.Connection) {
 
 	// Optimize for small response packet
 	if data, err := output.Read(); err == nil {
+		var v2writer v2io.Writer = v2io.NewAdaptiveWriter(bodyWriter)
 		if request.Option.IsChunkStream() {
-			vmessio.Authenticate(data)
+			v2writer = vmessio.NewAuthChunkWriter(v2writer)
 		}
-		bodyWriter.Write(data.Value)
-		data.Release()
+
+		v2writer.Write(data)
 
 		writer.SetCached(false)
-		go func(finish *sync.Mutex) {
-			var writer v2io.Writer = v2io.NewAdaptiveWriter(bodyWriter)
-			if request.Option.IsChunkStream() {
-				writer = vmessio.NewAuthChunkWriter(writer)
-			}
-			v2io.Pipe(output, writer)
-			output.Release()
-			if request.Option.IsChunkStream() {
-				writer.Write(alloc.NewSmallBuffer().Clear())
-			}
-			writer.Release()
-			finish.Unlock()
-		}(&writeFinish)
-		writeFinish.Lock()
+
+		v2io.Pipe(output, v2writer)
+		output.Release()
+		if request.Option.IsChunkStream() {
+			v2writer.Write(alloc.NewSmallBuffer().Clear())
+		}
+		v2writer.Release()
 	}
 
 	readFinish.Lock()

proxy/vmess/io/reader.go

@@ -6,6 +6,7 @@ import (
 	"io"
 
 	"github.com/v2ray/v2ray-core/common/alloc"
+	"github.com/v2ray/v2ray-core/common/log"
 	"github.com/v2ray/v2ray-core/common/serial"
 	"github.com/v2ray/v2ray-core/transport"
 )
@@ -36,6 +37,7 @@ func (this *Validator) Consume(b []byte) {
 }
 
 func (this *Validator) Validate() bool {
+	log.Debug("VMess Reader: Expected auth ", this.expectedAuth, " actual auth: ", this.actualAuth.Sum32())
 	return this.actualAuth.Sum32() == this.expectedAuth
 }
 
@@ -70,6 +72,7 @@ func (this *AuthChunkReader) Read() (*alloc.Buffer, error) {
 				return nil, err
 			}
 		}
+		log.Debug("VMess Reader: raw buffer: ", buffer.Value)
 		length := serial.BytesLiteral(buffer.Value[:2]).Uint16Value()
 		this.chunkLength = int(length) - 4
 		this.validator = NewValidator(serial.BytesLiteral(buffer.Value[2:6]).Uint32Value())
@@ -87,17 +90,9 @@ func (this *AuthChunkReader) Read() (*alloc.Buffer, error) {
 		return nil, io.EOF
 	}
 
-	if buffer.Len() <= this.chunkLength {
+	if buffer.Len() < this.chunkLength {
 		this.validator.Consume(buffer.Value)
 		this.chunkLength -= buffer.Len()
-		if this.chunkLength == 0 {
-			if !this.validator.Validate() {
-				buffer.Release()
-				return nil, transport.ErrorCorruptedPacket
-			}
-			this.chunkLength = -1
-			this.validator = nil
-		}
 	} else {
 		this.validator.Consume(buffer.Value[:this.chunkLength])
 		if !this.validator.Validate() {
@@ -105,9 +100,11 @@ func (this *AuthChunkReader) Read() (*alloc.Buffer, error) {
 			return nil, transport.ErrorCorruptedPacket
 		}
 		leftLength := buffer.Len() - this.chunkLength
-		this.last = AllocBuffer(leftLength).Clear()
-		this.last.Append(buffer.Value[this.chunkLength:])
-		buffer.Slice(0, this.chunkLength)
+		if leftLength > 0 {
+			this.last = AllocBuffer(leftLength).Clear()
+			this.last.Append(buffer.Value[this.chunkLength:])
+			buffer.Slice(0, this.chunkLength)
+		}
 
 		this.chunkLength = -1
 		this.validator = nil

proxy/vmess/outbound/outbound.go

@@ -69,25 +69,19 @@ func (this *VMessOutboundHandler) Dispatch(target v2net.Destination, payload *al
 
 func (this *VMessOutboundHandler) handleRequest(session *raw.ClientSession, conn net.Conn, request *protocol.RequestHeader, payload *alloc.Buffer, input v2io.Reader, finish *sync.Mutex) {
 	defer finish.Unlock()
-	defer payload.Release()
 
 	writer := v2io.NewBufferedWriter(conn)
 	defer writer.Release()
 	session.EncodeRequestHeader(request, writer)
 
-	if request.Option.IsChunkStream() {
-		vmessio.Authenticate(payload)
-	}
-
 	bodyWriter := session.EncodeRequestBody(writer)
-	bodyWriter.Write(payload.Value)
-
-	writer.SetCached(false)
-
 	var streamWriter v2io.Writer = v2io.NewAdaptiveWriter(bodyWriter)
 	if request.Option.IsChunkStream() {
 		streamWriter = vmessio.NewAuthChunkWriter(streamWriter)
 	}
+	streamWriter.Write(payload)
+	writer.SetCached(false)
+
 	v2io.Pipe(input, streamWriter)
 	if request.Option.IsChunkStream() {
 		streamWriter.Write(alloc.NewSmallBuffer().Clear())
@@ -110,7 +104,7 @@ func (this *VMessOutboundHandler) handleResponse(session *raw.ClientSession, con
 	go this.handleCommand(dest, header.Command)
 
 	reader.SetCached(false)
-	decryptReader := session.DecodeResponseBody(conn)
+	decryptReader := session.DecodeResponseBody(reader)
 
 	var bodyReader v2io.Reader
 	if request.Option.IsChunkStream() {