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

prepare for remove function

Browse Source
This commit is contained in:
Darien Raymond 2018-01-30 21:38:43 +01:00
parent 8923159aee
commit 0273b36027
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
proxy/vmess/vmess.go
View File

@ -25,7 +25,6 @@ type idEntry struct {
id *protocol.ID id *protocol.ID
userIdx int userIdx int
lastSec protocol.Timestamp lastSec protocol.Timestamp
lastSecRemoval protocol.Timestamp
} }
type TimedUserValidator struct { type TimedUserValidator struct {
@ -56,25 +55,26 @@ func NewTimedUserValidator(ctx context.Context, hasher protocol.IDHash) protocol
func (v *TimedUserValidator) generateNewHashes(nowSec protocol.Timestamp, idx int, entry *idEntry) { func (v *TimedUserValidator) generateNewHashes(nowSec protocol.Timestamp, idx int, entry *idEntry) {
var hashValue [16]byte var hashValue [16]byte
var hashValueRemoval [16]byte
idHash := v.hasher(entry.id.Bytes()) idHash := v.hasher(entry.id.Bytes())
for entry.lastSec <= nowSec { for entry.lastSec <= nowSec {
common.Must2(idHash.Write(entry.lastSec.Bytes(nil))) common.Must2(idHash.Write(entry.lastSec.Bytes(nil)))
idHash.Sum(hashValue[:0]) idHash.Sum(hashValue[:0])
idHash.Reset() idHash.Reset()
common.Must2(idHash.Write(entry.lastSecRemoval.Bytes(nil)))
idHash.Sum(hashValueRemoval[:0])
idHash.Reset()
delete(v.userHash, hashValueRemoval)
v.userHash[hashValue] = indexTimePair{ v.userHash[hashValue] = indexTimePair{
index: idx, index: idx,
timeInc: uint32(entry.lastSec - v.baseTime), timeInc: uint32(entry.lastSec - v.baseTime),
} }
entry.lastSec++ entry.lastSec++
entry.lastSecRemoval++ }
}
func (v *TimedUserValidator) removeExpiredHashes(expire uint32) {
for key, pair := range v.userHash {
if pair.timeInc < expire {
delete(v.userHash, key)
}
} }
} }
@ -87,6 +87,11 @@ func (v *TimedUserValidator) updateUserHash(ctx context.Context, interval time.D
for _, entry := range v.ids { for _, entry := range v.ids {
v.generateNewHashes(nowSec, entry.userIdx, entry) v.generateNewHashes(nowSec, entry.userIdx, entry)
} }
expire := protocol.Timestamp(now.Unix() - cacheDurationSec*3)
if expire > v.baseTime {
v.removeExpiredHashes(uint32(expire - v.baseTime))
}
v.Unlock() v.Unlock()
case <-ctx.Done(): case <-ctx.Done():
return return
@ -112,7 +117,6 @@ func (v *TimedUserValidator) Add(user *protocol.User) error {
id: account.ID, id: account.ID,
userIdx: idx, userIdx: idx,
lastSec: protocol.Timestamp(nowSec - cacheDurationSec), lastSec: protocol.Timestamp(nowSec - cacheDurationSec),
lastSecRemoval: protocol.Timestamp(nowSec - cacheDurationSec*3),
} }
v.generateNewHashes(protocol.Timestamp(nowSec+cacheDurationSec), idx, entry) v.generateNewHashes(protocol.Timestamp(nowSec+cacheDurationSec), idx, entry)
v.ids = append(v.ids, entry) v.ids = append(v.ids, entry)
@ -121,7 +125,6 @@ func (v *TimedUserValidator) Add(user *protocol.User) error {
id: alterid, id: alterid,
userIdx: idx, userIdx: idx,
lastSec: protocol.Timestamp(nowSec - cacheDurationSec), lastSec: protocol.Timestamp(nowSec - cacheDurationSec),
lastSecRemoval: protocol.Timestamp(nowSec - cacheDurationSec*3),
} }
v.generateNewHashes(protocol.Timestamp(nowSec+cacheDurationSec), idx, entry) v.generateNewHashes(protocol.Timestamp(nowSec+cacheDurationSec), idx, entry)
v.ids = append(v.ids, entry) v.ids = append(v.ids, entry)