github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix time based user hash

pull/182/head^2
V2Ray 2015-09-14 22:00:03 +02:00
parent 7fef20258e
commit 3138960443
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
userset.go
View File

@ -2,6 +2,8 @@ package core
import ( import (
"time" "time"
_ "github.com/v2ray/v2ray-core/log"
) )
const ( const (
@ -37,7 +39,7 @@ func (us *TimedUserSet) updateUserHash(tick <-chan time.Time) {
now := time.Now().UTC() now := time.Now().UTC()
lastSec := now.Unix() - cacheDurationSec lastSec := now.Unix() - cacheDurationSec
hash2Remove := make(chan hashEntry, updateIntervalSec*2) hash2Remove := make(chan hashEntry, cacheDurationSec*2)
lastSec2Remove := now.Unix() + cacheDurationSec lastSec2Remove := now.Unix() + cacheDurationSec
for { for {
now := <-tick now := <-tick
@ -51,14 +53,16 @@ func (us *TimedUserSet) updateUserHash(tick <-chan time.Time) {
delete(us.userHashes, entry.hash) delete(us.userHashes, entry.hash)
} }
} }
for i := lastSec + 1; i <= nowSec; i++ { for lastSec < nowSec + updateIntervalSec {
for idx, id := range us.validUserIds { for idx, id := range us.validUserIds {
idHash := id.TimeHash(i) idHash := id.TimeHash(lastSec)
hash2Remove <- hashEntry{string(idHash), i} hash2Remove <- hashEntry{string(idHash), lastSec}
//log.Debug("Hash: %v", idHash)
us.userHashes[string(idHash)] = idx us.userHashes[string(idHash)] = idx
} }
} lastSec ++
}
} }
} }