lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-27 06:16:09 -04:00
Code Issues Releases Wiki Activity

Revert "pooled session objects"

Browse Source 
This reverts commit a89ff38fe6.
This commit is contained in:
Darien Raymond 2018-09-14 16:51:46 +02:00
parent 2ad12084ba
commit cb2658f2bf
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
5 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proxy/vmess/encoding/client.go
View File

@ -5,7 +5,6 @@ import (
"crypto/rand"
"hash/fnv"
"io"
"sync"
"golang.org/x/crypto/chacha20poly1305"
@ -39,16 +38,12 @@ type ClientSession struct {
responseHeader byte
}
var clientSessionPool = sync.Pool{
New: func() interface{} { return &ClientSession{} },
}
// NewClientSession creates a new ClientSession.
func NewClientSession(idHash protocol.IDHash) *ClientSession {
randomBytes := make([]byte, 33) // 16 + 16 + 1
common.Must2(rand.Read(randomBytes))
session := clientSessionPool.Get().(*ClientSession)
session := &ClientSession{}
copy(session.requestBodyKey[:], randomBytes[:16])
copy(session.requestBodyIV[:], randomBytes[16:32])
session.responseHeader = randomBytes[32]
@ -59,12 +54,6 @@ func NewClientSession(idHash protocol.IDHash) *ClientSession {
return session
}
func ReleaseClientSession(session *ClientSession) {
session.idHash = nil
session.responseReader = nil
clientSessionPool.Put(session)
}
func (c *ClientSession) EncodeRequestHeader(header *protocol.RequestHeader, writer io.Writer) error {
timestamp := protocol.NewTimestampGenerator(protocol.NowTime(), 30)()
account := header.User.Account.(*vmess.InternalAccount)

7
proxy/vmess/encoding/encoding_test.go
View File

@ -44,8 +44,6 @@ func TestRequestSerialization(t *testing.T) {
buffer := buf.New()
client := NewClientSession(protocol.DefaultIDHash)
defer ReleaseClientSession(client)
common.Must(client.EncodeRequestHeader(expectedRequest, buffer))
buffer2 := buf.New()
@ -59,7 +57,6 @@ func TestRequestSerialization(t *testing.T) {
defer common.Close(userValidator)
server := NewServerSession(userValidator, sessionHistory)
defer ReleaseServerSession(server)
actualRequest, err := server.DecodeRequestHeader(buffer)
assert(err, IsNil)
@ -100,8 +97,6 @@ func TestInvalidRequest(t *testing.T) {
buffer := buf.New()
client := NewClientSession(protocol.DefaultIDHash)
defer ReleaseClientSession(client)
common.Must(client.EncodeRequestHeader(expectedRequest, buffer))
buffer2 := buf.New()
@ -115,7 +110,6 @@ func TestInvalidRequest(t *testing.T) {
defer common.Close(userValidator)
server := NewServerSession(userValidator, sessionHistory)
defer ReleaseServerSession(server)
_, err := server.DecodeRequestHeader(buffer)
assert(err, IsNotNil)
}
@ -156,7 +150,6 @@ func TestMuxRequest(t *testing.T) {
defer common.Close(userValidator)
server := NewServerSession(userValidator, sessionHistory)
defer ReleaseServerSession(server)
actualRequest, err := server.DecodeRequestHeader(buffer)
assert(err, IsNil)

19
proxy/vmess/encoding/server.go
View File

@ -99,24 +99,13 @@ type ServerSession struct {
responseHeader byte
}
var serverSessionPool = sync.Pool{
New: func() interface{} { return &ServerSession{} },
}
// NewServerSession creates a new ServerSession, using the given UserValidator.
// The ServerSession instance doesn't take ownership of the validator.
func NewServerSession(validator *vmess.TimedUserValidator, sessionHistory *SessionHistory) *ServerSession {
session := serverSessionPool.Get().(*ServerSession)
session.userValidator = validator
session.sessionHistory = sessionHistory
return session
}
func ReleaseServerSession(session *ServerSession) {
session.responseWriter = nil
session.userValidator = nil
session.sessionHistory = nil
serverSessionPool.Put(session)
return &ServerSession{
userValidator: validator,
sessionHistory: sessionHistory,
}
}
func parseSecurityType(b byte) protocol.SecurityType {

2
proxy/vmess/inbound/inbound.go
View File

@ -221,8 +221,6 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
reader := &buf.BufferedReader{Reader: buf.NewReader(connection)}
svrSession := encoding.NewServerSession(h.clients, h.sessionHistory)
defer encoding.ReleaseServerSession(svrSession)
request, err := svrSession.DecodeRequestHeader(reader)
if err != nil {

2
proxy/vmess/outbound/outbound.go
View File

@ -106,8 +106,6 @@ func (v *Handler) Process(ctx context.Context, link *core.Link, dialer proxy.Dia
output := link.Writer
session := encoding.NewClientSession(protocol.DefaultIDHash)
defer encoding.ReleaseClientSession(session)
sessionPolicy := v.v.PolicyManager().ForLevel(request.User.Level)
ctx, cancel := context.WithCancel(ctx)