lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 10:08:15 -05:00
Code Issues Releases Wiki Activity

update predicate syntax

Browse Source
This commit is contained in:
Darien Raymond 2016-10-11 12:44:17 +02:00
parent da9f1a8013
commit f8ad1f4a3e
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/predicate/predicate.go
View File

@ -2,6 +2,14 @@ package predicate
type Predicate func() bool type Predicate func() bool
func (this Predicate) And(predicate Predicate) Predicate {
return All(this, predicate)
}
func (this Predicate) Or(predicate Predicate) Predicate {
return Any(this, predicate)
}
func All(predicates ...Predicate) Predicate { func All(predicates ...Predicate) Predicate {
return func() bool { return func() bool {
for _, p := range predicates { for _, p := range predicates {

2
transport/internet/kcp/connection.go
View File

@ -233,7 +233,7 @@ func NewConnection(conv uint16, writerCloser io.WriteCloser, local *net.UDPAddr,
} }
conn.dataUpdater = NewUpdater( conn.dataUpdater = NewUpdater(
conn.interval, conn.interval,
predicate.All(predicate.Not(isTerminating), predicate.Any(conn.sendingWorker.UpdateNecessary, conn.receivingWorker.UpdateNecessary)), predicate.Not(isTerminating).And(predicate.Any(conn.sendingWorker.UpdateNecessary, conn.receivingWorker.UpdateNecessary)),
isTerminating, isTerminating,
conn.updateTask) conn.updateTask)
conn.pingUpdater = NewUpdater( conn.pingUpdater = NewUpdater(