This commit is contained in:
Darien Raymond 2018-02-05 23:39:04 +01:00
parent 1e6d5561cc
commit 3a0f211c22
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
6 changed files with 18 additions and 14 deletions

View File

@ -2,4 +2,6 @@ package commander
import "v2ray.com/core/common/errors"
func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "Commander") }
func newError(values ...interface{}) *errors.Error {
return errors.New(values...).Path("App", "Commander")
}

View File

@ -62,4 +62,4 @@ func (co *CommanderOutbound) Start() error {
return nil
}
func (co *CommanderOutbound) Close() {}
func (co *CommanderOutbound) Close() {}

View File

@ -2,4 +2,6 @@ package command
import "v2ray.com/core/common/errors"
func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("App", "Proxyman", "Command") }
func newError(values ...interface{}) *errors.Error {
return errors.New(values...).Path("App", "Proxyman", "Command")
}

View File

@ -53,4 +53,4 @@ type GetInbound interface {
type GetOutbound interface {
GetOutbound() Outbound
}
}

View File

@ -22,9 +22,9 @@ const (
)
type idEntry struct {
id *protocol.ID
userIdx int
lastSec protocol.Timestamp
id *protocol.ID
userIdx int
lastSec protocol.Timestamp
}
type TimedUserValidator struct {
@ -114,17 +114,17 @@ func (v *TimedUserValidator) Add(user *protocol.User) error {
nowSec := time.Now().Unix()
entry := &idEntry{
id: account.ID,
userIdx: idx,
lastSec: protocol.Timestamp(nowSec - cacheDurationSec),
id: account.ID,
userIdx: idx,
lastSec: protocol.Timestamp(nowSec - cacheDurationSec),
}
v.generateNewHashes(protocol.Timestamp(nowSec+cacheDurationSec), idx, entry)
v.ids = append(v.ids, entry)
for _, alterid := range account.AlterIDs {
entry := &idEntry{
id: alterid,
userIdx: idx,
lastSec: protocol.Timestamp(nowSec - cacheDurationSec),
id: alterid,
userIdx: idx,
lastSec: protocol.Timestamp(nowSec - cacheDurationSec),
}
v.generateNewHashes(protocol.Timestamp(nowSec+cacheDurationSec), idx, entry)
v.ids = append(v.ids, entry)

View File

@ -364,7 +364,7 @@ func (w *SendingWorker) CloseWrite() {
}
func (w *SendingWorker) IsEmpty() bool {
w.RLock()
w.RLock()
defer w.RUnlock()
return w.window.IsEmpty()