lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-26 20:15:26 -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

21
proxy/shadowsocks/client.go
View File

@@ -3,6 +3,10 @@ package shadowsocks
import (
"context"
"time"
"runtime"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/bufio"
@@ -88,6 +92,9 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay) error
request.Option |= RequestOptionOneTimeAuth
}
ctx, cancel := context.WithCancel(ctx)
timer := signal.CancelAfterInactivity(ctx, cancel, time.Minute*2)
if request.Command == protocol.RequestCommandTCP {
bufferedWriter := bufio.NewWriter(conn)
bodyWriter, err := WriteTCPRequest(request, bufferedWriter)
@@ -99,7 +106,7 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay) error
bufferedWriter.SetBuffered(false)
requestDone := signal.ExecuteAsync(func() error {
if err := buf.PipeUntilEOF(outboundRay.OutboundInput(), bodyWriter); err != nil {
if err := buf.PipeUntilEOF(timer, outboundRay.OutboundInput(), bodyWriter); err != nil {
return err
}
return nil
@@ -113,7 +120,7 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay) error
return err
}
if err := buf.Pipe(responseReader, outboundRay.OutboundOutput()); err != nil {
if err := buf.PipeUntilEOF(timer, responseReader, outboundRay.OutboundOutput()); err != nil {
return err
}
@@ -136,24 +143,22 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay) error
}
requestDone := signal.ExecuteAsync(func() error {
if err := buf.PipeUntilEOF(outboundRay.OutboundInput(), writer); err != nil {
if err := buf.PipeUntilEOF(timer, outboundRay.OutboundInput(), writer); err != nil {
log.Info("Shadowsocks|Client: Failed to transport all UDP request: ", err)
return err
}
return nil
})
timedReader := net.NewTimeOutReader(16, conn)
responseDone := signal.ExecuteAsync(func() error {
defer outboundRay.OutboundOutput().Close()
reader := &UDPReader{
Reader: timedReader,
Reader: conn,
User: user,
}
if err := buf.Pipe(reader, outboundRay.OutboundOutput()); err != nil {
if err := buf.PipeUntilEOF(timer, reader, outboundRay.OutboundOutput()); err != nil {
log.Info("Shadowsocks|Client: Failed to transport all UDP response: ", err)
return err
}
@@ -168,6 +173,8 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay) error
return nil
}
runtime.KeepAlive(timer)
return nil
}