unified release

proxy/shadowsocks/ota.go

@@ -6,6 +6,7 @@ import (
 	"crypto/sha1"
 	"io"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/buf"
 	"v2ray.com/core/common/errors"
 	"v2ray.com/core/common/serial"
@@ -70,8 +71,8 @@ func NewChunkReader(reader io.Reader, auth *Authenticator) *ChunkReader {
 }
 
 func (v *ChunkReader) Release() {
-	v.reader = nil
-	v.auth = nil
+	common.Release(v.reader)
+	common.Release(v.auth)
 }
 
 func (v *ChunkReader) Read() (*buf.Buffer, error) {
@@ -124,8 +125,8 @@ func NewChunkWriter(writer io.Writer, auth *Authenticator) *ChunkWriter {
 }
 
 func (v *ChunkWriter) Release() {
-	v.writer = nil
-	v.auth = nil
+	common.Release(v.writer)
+	common.Release(v.auth)
 }
 
 func (v *ChunkWriter) Write(payload *buf.Buffer) error {

proxy/vmess/vmess.go

@@ -69,11 +69,6 @@ func (v *TimedUserValidator) Release() {
 	}
 
 	v.running = false
-	v.validUsers = nil
-	v.userHash = nil
-	v.ids = nil
-	v.hasher = nil
-	v.cancel = nil
 }
 
 func (v *TimedUserValidator) generateNewHashes(nowSec protocol.Timestamp, idx int, entry *idEntry) {
@@ -89,10 +84,8 @@ func (v *TimedUserValidator) generateNewHashes(nowSec protocol.Timestamp, idx in
 		idHash.Sum(hashValueRemoval[:0])
 		idHash.Reset()
 
-		v.Lock()
 		v.userHash[hashValue] = &indexTimePair{idx, entry.lastSec}
 		delete(v.userHash, hashValueRemoval)
-		v.Unlock()
 
 		entry.lastSec++
 		entry.lastSecRemoval++
@@ -107,9 +100,11 @@ func (v *TimedUserValidator) updateUserHash(interval time.Duration) {
 		select {
 		case now := <-time.After(interval):
 			nowSec := protocol.Timestamp(now.Unix() + cacheDurationSec)
+			v.Lock()
 			for _, entry := range v.ids {
 				v.generateNewHashes(nowSec, entry.userIdx, entry)
 			}
+			v.Unlock()
 		case <-v.cancel.WaitForCancel():
 			return
 		}
@@ -117,6 +112,9 @@ func (v *TimedUserValidator) updateUserHash(interval time.Duration) {
 }
 
 func (v *TimedUserValidator) Add(user *protocol.User) error {
+	v.Lock()
+	defer v.Unlock()
+
 	idx := len(v.validUsers)
 	v.validUsers = append(v.validUsers, user)
 	rawAccount, err := user.GetTypedAccount()