lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-01 23:15:21 -05:00
Code Issues Releases Wiki Activity

clean up dns package

Browse Source
This commit is contained in:
Darien Raymond
2017-11-15 00:36:14 +01:00
parent a430e2065a
commit 0dbfb66126
16 changed files with 225 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/socks/server.go
View File

@@ -107,7 +107,8 @@ func (v *Server) transport(ctx context.Context, reader io.Reader, writer io.Writ
if timeout == 0 {
timeout = time.Minute * 5
}
ctx, timer := signal.CancelAfterInactivity(ctx, timeout)
ctx, cancel := context.WithCancel(ctx)
timer := signal.CancelAfterInactivity(ctx, cancel, timeout)
ray, err := dispatcher.Dispatch(ctx, dest)
if err != nil {