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

refine dynamic strategy

Browse Source
This commit is contained in:
v2ray 2016-06-05 23:39:38 +02:00
parent aad10a75d3
commit 045e1dcc53
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
shell/point/inbound_detour_dynamic.go
View File

@ -18,6 +18,7 @@ type InboundDetourHandlerDynamic struct {
config *InboundDetourConfig
portsInUse map[v2net.Port]bool
ichs []proxy.InboundHandler
ich2Recyle []proxy.InboundHandler
lastRefresh time.Time
}
@ -74,11 +75,25 @@ func (this *InboundDetourHandlerDynamic) Close() {
}
}
func (this *InboundDetourHandlerDynamic) RecyleHandles() {
if this.ich2Recyle != nil {
for _, ich := range this.ich2Recyle {
if ich == nil {
continue
}
port := ich.Port()
ich.Close()
delete(this.portsInUse, port)
}
this.ich2Recyle = nil
}
}
func (this *InboundDetourHandlerDynamic) refresh() error {
this.lastRefresh = time.Now()
config := this.config
ich2Recycle := this.ichs
this.ich2Recyle = this.ichs
newIchs := make([]proxy.InboundHandler, config.Allocation.Concurrency)
for idx, _ := range newIchs {
@ -102,19 +117,6 @@ func (this *InboundDetourHandlerDynamic) refresh() error {
this.ichs = newIchs
this.Unlock()
go func() {
time.Sleep(time.Minute)
for _, ich := range ich2Recycle {
if ich == nil {
continue
}
port := ich.Port()
ich.Close()
delete(this.portsInUse, port)
}
ich2Recycle = nil
}()
return nil
}
@ -127,7 +129,8 @@ func (this *InboundDetourHandlerDynamic) Start() error {
go func() {
for {
time.Sleep(time.Duration(this.config.Allocation.Refresh) * time.Minute)
time.Sleep(time.Duration(this.config.Allocation.Refresh)*time.Minute - 1)
this.RecyleHandles()
err := this.refresh()
if err != nil {
log.Error("Point: Failed to refresh dynamic allocations: ", err)