Migrate VMessIn with protocol

This commit is contained in:
v2ray committed 2016-02-27 17:28:21 +01:00
1 parent 2144c47102
commit 547cc75651
6 files changed
+63 -65

No files matched your search

+5 -1
View File
@@ -19,6 +19,10 @@ var (
)
func MarshalCommand(command interface{}, writer io.Writer) error {
if command == nil {
return ErrorUnknownCommand
}
var cmdId byte
var factory CommandFactory
switch command.(type) {
@@ -29,7 +33,7 @@ func MarshalCommand(command interface{}, writer io.Writer) error {
return ErrorUnknownCommand
}
buffer := alloc.NewSmallBuffer()
buffer := alloc.NewSmallBuffer().Clear()
err := factory.Marshal(command, buffer)
if err != nil {
return err
+3 -3
View File
@@ -1,9 +1,9 @@
package raw_test
import (
"bytes"
"testing"
"github.com/v2ray/v2ray-core/common/alloc"
netassert "github.com/v2ray/v2ray-core/common/net/testing/assert"
"github.com/v2ray/v2ray-core/common/protocol"
. "github.com/v2ray/v2ray-core/common/protocol/raw"
@@ -23,11 +23,11 @@ func TestSwitchAccount(t *testing.T) {
ValidMin: 16,
}
buffer := bytes.NewBuffer(make([]byte, 0, 1024))
buffer := alloc.NewBuffer().Clear()
err := MarshalCommand(sa, buffer)
assert.Error(err).IsNil()
cmd, err := UnmarshalCommand(1, buffer.Bytes())
cmd, err := UnmarshalCommand(1, buffer.Value[2:])
assert.Error(err).IsNil()
sa2, ok := cmd.(*protocol.CommandSwitchAccount)
+11 -2
View File
@@ -24,6 +24,12 @@ type ServerSession struct {
responseWriter io.Writer
}
func NewServerSession(validator protocol.UserValidator) *ServerSession {
return &ServerSession{
userValidator: validator,
}
}
func (this *ServerSession) DecodeRequestHeader(reader io.Reader) (*protocol.RequestHeader, error) {
buffer := alloc.NewSmallBuffer()
defer buffer.Release()
@@ -134,14 +140,17 @@ func (this *ServerSession) EncodeResponseHeader(header *protocol.ResponseHeader,
responseBodyKey := md5.Sum(this.requestBodyKey)
responseBodyIV := md5.Sum(this.requestBodyIV)
this.responseBodyKey = responseBodyKey[:]
this.requestBodyIV = responseBodyIV[:]
this.responseBodyIV = responseBodyIV[:]
aesStream := crypto.NewAesEncryptionStream(this.responseBodyKey, this.responseBodyIV)
encryptionWriter := crypto.NewCryptionWriter(aesStream, writer)
this.responseWriter = encryptionWriter
encryptionWriter.Write([]byte{this.responseHeader, 0x00})
MarshalCommand(header.Command, encryptionWriter)
err := MarshalCommand(header.Command, encryptionWriter)
if err != nil {
encryptionWriter.Write([]byte{0x00, 0x00})
}
}
func (this *ServerSession) EncodeResponseBody(writer io.Writer) io.Writer {