Merge branch 'master' of https://github.com/v2ray/v2ray-core

app/proxyman/mux/mux_test.go

@@ -14,15 +14,34 @@ import (
 func TestReaderWriter(t *testing.T) {
 	assert := assert.On(t)
 
-	dest := net.TCPDestination(net.DomainAddress("v2ray.com"), 80)
 	stream := ray.NewStream(context.Background())
+
+	dest := net.TCPDestination(net.DomainAddress("v2ray.com"), 80)
 	writer := NewWriter(1, dest, stream)
 
-	payload := buf.New()
+	dest2 := net.TCPDestination(net.LocalHostIP, 443)
-	payload.AppendBytes('a', 'b', 'c', 'd')
+	writer2 := NewWriter(2, dest2, stream)
-	assert.Error(writer.Write(buf.NewMultiBufferValue(payload))).IsNil()
+
+	dest3 := net.TCPDestination(net.LocalHostIPv6, 18374)
+	writer3 := NewWriter(3, dest3, stream)
+
+	writePayload := func(writer *Writer, payload ...byte) error {
+		b := buf.New()
+		b.Append(payload)
+		return writer.Write(buf.NewMultiBufferValue(b))
+	}
+
+	assert.Error(writePayload(writer, 'a', 'b', 'c', 'd')).IsNil()
+	assert.Error(writePayload(writer2)).IsNil()
+
+	assert.Error(writePayload(writer, 'e', 'f', 'g', 'h')).IsNil()
+	assert.Error(writePayload(writer3, 'x')).IsNil()
 
 	writer.Close()
+	writer3.Close()
+
+	assert.Error(writePayload(writer2, 'y')).IsNil()
+	writer2.Close()
 
 	reader := NewReader(stream)
 	meta, err := reader.ReadMetadata()
@@ -34,10 +53,70 @@ func TestReaderWriter(t *testing.T) {
 
 	data, err := reader.Read()
 	assert.Error(err).IsNil()
+	assert.Int(len(data)).Equals(1)
 	assert.String(data[0].String()).Equals("abcd")
 
+	meta, err = reader.ReadMetadata()
+	assert.Error(err).IsNil()
+	assert.Byte(byte(meta.SessionStatus)).Equals(byte(SessionStatusNew))
+	assert.Uint16(meta.SessionID).Equals(2)
+	assert.Byte(byte(meta.Option)).Equals(0)
+	assert.Destination(meta.Target).Equals(dest2)
+
+	meta, err = reader.ReadMetadata()
+	assert.Error(err).IsNil()
+	assert.Byte(byte(meta.SessionStatus)).Equals(byte(SessionStatusKeep))
+	assert.Uint16(meta.SessionID).Equals(1)
+	assert.Byte(byte(meta.Option)).Equals(1)
+
+	data, err = reader.Read()
+	assert.Error(err).IsNil()
+	assert.Int(len(data)).Equals(1)
+	assert.String(data[0].String()).Equals("efgh")
+
+	meta, err = reader.ReadMetadata()
+	assert.Error(err).IsNil()
+	assert.Byte(byte(meta.SessionStatus)).Equals(byte(SessionStatusNew))
+	assert.Uint16(meta.SessionID).Equals(3)
+	assert.Byte(byte(meta.Option)).Equals(1)
+	assert.Destination(meta.Target).Equals(dest3)
+
+	data, err = reader.Read()
+	assert.Error(err).IsNil()
+	assert.Int(len(data)).Equals(1)
+	assert.String(data[0].String()).Equals("x")
+
 	meta, err = reader.ReadMetadata()
 	assert.Error(err).IsNil()
 	assert.Byte(byte(meta.SessionStatus)).Equals(byte(SessionStatusEnd))
 	assert.Uint16(meta.SessionID).Equals(1)
+	assert.Byte(byte(meta.Option)).Equals(0)
+
+	meta, err = reader.ReadMetadata()
+	assert.Error(err).IsNil()
+	assert.Byte(byte(meta.SessionStatus)).Equals(byte(SessionStatusEnd))
+	assert.Uint16(meta.SessionID).Equals(3)
+	assert.Byte(byte(meta.Option)).Equals(0)
+
+	meta, err = reader.ReadMetadata()
+	assert.Error(err).IsNil()
+	assert.Byte(byte(meta.SessionStatus)).Equals(byte(SessionStatusKeep))
+	assert.Uint16(meta.SessionID).Equals(2)
+	assert.Byte(byte(meta.Option)).Equals(1)
+
+	data, err = reader.Read()
+	assert.Error(err).IsNil()
+	assert.Int(len(data)).Equals(1)
+	assert.String(data[0].String()).Equals("y")
+
+	meta, err = reader.ReadMetadata()
+	assert.Error(err).IsNil()
+	assert.Byte(byte(meta.SessionStatus)).Equals(byte(SessionStatusEnd))
+	assert.Uint16(meta.SessionID).Equals(2)
+	assert.Byte(byte(meta.Option)).Equals(0)
+
+	stream.Close()
+
+	meta, err = reader.ReadMetadata()
+	assert.Error(err).IsNotNil()
 }