Revert "pooled session objects"

This reverts commit a89ff38fe61c89b8151da9d400729fade729361e.

proxy/vmess/encoding/client.go

@@ -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)

proxy/vmess/encoding/encoding_test.go

@@ -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)
 

proxy/vmess/encoding/server.go

@@ -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 {

proxy/vmess/inbound/inbound.go

@@ -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 {

proxy/vmess/outbound/outbound.go

@@ -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)