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

merge conflict

Browse Source
This commit is contained in:
v2ray 2016-06-05 23:42:16 +02:00
parent 08261e4f13
commit 3376ea078d
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
shell/point/inbound_detour_dynamic.go
View File

@ -117,21 +117,6 @@ func (this *InboundDetourHandlerDynamic) refresh() error {
this.ichs = newIchs
this.Unlock()
<<<<<<< HEAD
go func(recycles []proxy.InboundHandler) {
time.Sleep(time.Minute)
for _, ich := range recycles {
if ich == nil {
continue
}
port := ich.Port()
ich.Close()
delete(this.portsInUse, port)
}
}(ich2Recycle)
=======
>>>>>>> 045e1dcc5329b68fee3fc0f94b1c50d6ee303b27
return nil
}