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

More accurate hash generation

pull/40/head
V2Ray 2015-10-10 21:43:40 +02:00
parent 7fe9683f28
commit d4f3fc0c0f
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/collect/timed_queue.go
View File

@ -72,14 +72,14 @@ func (queue *TimedQueue) RemovedEntries() <-chan interface{} {
func (queue *TimedQueue) cleanup(tick <-chan time.Time) { func (queue *TimedQueue) cleanup(tick <-chan time.Time) {
for now := range tick { for now := range tick {
queue.access.RLock()
queueLen := queue.queue.Len()
queue.access.RUnlock()
if queueLen == 0 {
continue
}
nowSec := now.UTC().Unix() nowSec := now.UTC().Unix()
for { for {
queue.access.RLock()
queueLen := queue.queue.Len()
queue.access.RUnlock()
if queueLen == 0 {
break
}
queue.access.RLock() queue.access.RLock()
entry := queue.queue[0] entry := queue.queue[0]
queue.access.RUnlock() queue.access.RUnlock()

5
proxy/vmess/protocol/user/userset.go
View File

@ -62,8 +62,7 @@ func (us *TimedUserSet) generateNewHashes(lastSec, nowSec int64, idx int, id ID)
} }
func (us *TimedUserSet) updateUserHash(tick <-chan time.Time) { func (us *TimedUserSet) updateUserHash(tick <-chan time.Time) {
now := time.Now().UTC() lastSec := time.Now().UTC().Unix() - cacheDurationSec
lastSec := now.Unix()
for now := range tick { for now := range tick {
nowSec := now.UTC().Unix() + cacheDurationSec nowSec := now.UTC().Unix() + cacheDurationSec
@ -81,7 +80,7 @@ func (us *TimedUserSet) AddUser(user User) error {
nowSec := time.Now().UTC().Unix() nowSec := time.Now().UTC().Unix()
lastSec := nowSec - cacheDurationSec lastSec := nowSec - cacheDurationSec
us.generateNewHashes(lastSec, nowSec, idx, id) us.generateNewHashes(lastSec, nowSec+cacheDurationSec, idx, id)
return nil return nil
} }