lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 15:36:41 -05:00
Code Issues Releases Wiki Activity

more readable for func generateNewHashes in proxy/vmess/validator.go

Browse Source
This commit is contained in:
comwrg 2018-11-02 09:58:40 +08:00
parent 41956e92a5
commit 65df107eac
No known key found for this signature in database
GPG Key ID: 315F3A656223B79B
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proxy/vmess/validator.go
View File

@ -56,13 +56,14 @@ func NewTimedUserValidator(hasher protocol.IDHash) *TimedUserValidator {
func (v *TimedUserValidator) generateNewHashes(nowSec protocol.Timestamp, user *user) { func (v *TimedUserValidator) generateNewHashes(nowSec protocol.Timestamp, user *user) {
var hashValue [16]byte var hashValue [16]byte
genEndSec := nowSec + cacheDurationSec
genHashForID := func(id *protocol.ID) { genHashForID := func(id *protocol.ID) {
idHash := v.hasher(id.Bytes()) idHash := v.hasher(id.Bytes())
lastSec := user.lastSec genBeginSec := user.lastSec
if lastSec < nowSec-cacheDurationSec*2 { if genBeginSec < nowSec-cacheDurationSec {
lastSec = nowSec - cacheDurationSec*2 genBeginSec = nowSec - cacheDurationSec
} }
for ts := lastSec; ts <= nowSec; ts++ { for ts := genBeginSec; ts <= genEndSec; ts++ {
common.Must2(idHash.Write(ts.Bytes(nil))) common.Must2(idHash.Write(ts.Bytes(nil)))
idHash.Sum(hashValue[:0]) idHash.Sum(hashValue[:0])
idHash.Reset() idHash.Reset()
@ -80,7 +81,7 @@ func (v *TimedUserValidator) generateNewHashes(nowSec protocol.Timestamp, user *
for _, id := range account.AlterIDs { for _, id := range account.AlterIDs {
genHashForID(id) genHashForID(id)
} }
user.lastSec = nowSec user.lastSec = genEndSec
} }
func (v *TimedUserValidator) removeExpiredHashes(expire uint32) { func (v *TimedUserValidator) removeExpiredHashes(expire uint32) {
@ -93,7 +94,7 @@ func (v *TimedUserValidator) removeExpiredHashes(expire uint32) {
func (v *TimedUserValidator) updateUserHash() { func (v *TimedUserValidator) updateUserHash() {
now := time.Now() now := time.Now()
nowSec := protocol.Timestamp(now.Unix() + cacheDurationSec) nowSec := protocol.Timestamp(now.Unix())
v.Lock() v.Lock()
defer v.Unlock() defer v.Unlock()
@ -118,7 +119,7 @@ func (v *TimedUserValidator) Add(u *protocol.MemoryUser) error {
lastSec: protocol.Timestamp(nowSec - cacheDurationSec), lastSec: protocol.Timestamp(nowSec - cacheDurationSec),
} }
v.users = append(v.users, uu) v.users = append(v.users, uu)
v.generateNewHashes(protocol.Timestamp(nowSec+cacheDurationSec), uu) v.generateNewHashes(protocol.Timestamp(nowSec), uu)
return nil return nil
} }