lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-30 05:55:20 -05:00
Code Issues Releases Wiki Activity

cancel sessions after inactivity

Browse Source
This commit is contained in:
Darien Raymond
2017-01-31 12:42:05 +01:00
parent 75b5a62c11
commit c462e35aad
11 changed files with 159 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
proxy/vmess/outbound/outbound.go
View File

@@ -2,6 +2,7 @@ package outbound
import (
"context"
"runtime"
"time"
"v2ray.com/core/app"
@@ -101,6 +102,9 @@ func (v *VMessOutboundHandler) Process(ctx context.Context, outboundRay ray.Outb
session := encoding.NewClientSession(protocol.DefaultIDHash)
ctx, cancel := context.WithCancel(ctx)
timer := signal.CancelAfterInactivity(ctx, cancel, time.Minute*2)
requestDone := signal.ExecuteAsync(func() error {
writer := bufio.NewWriter(conn)
session.EncodeRequestHeader(request, writer)
@@ -119,7 +123,7 @@ func (v *VMessOutboundHandler) Process(ctx context.Context, outboundRay ray.Outb
writer.SetBuffered(false)
if err := buf.PipeUntilEOF(input, bodyWriter); err != nil {
if err := buf.PipeUntilEOF(timer, input, bodyWriter); err != nil {
return err
}
@@ -145,7 +149,7 @@ func (v *VMessOutboundHandler) Process(ctx context.Context, outboundRay ray.Outb
reader.SetBuffered(false)
bodyReader := session.DecodeResponseBody(request, reader)
if err := buf.Pipe(bodyReader, output); err != nil {
if err := buf.PipeUntilEOF(timer, bodyReader, output); err != nil {
return err
}
@@ -157,6 +161,7 @@ func (v *VMessOutboundHandler) Process(ctx context.Context, outboundRay ray.Outb
conn.SetReusable(false)
return err
}
runtime.KeepAlive(timer)
return nil
}