lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-06-22 10:49:58 -04:00
Code Issues Releases Wiki Activity

handle close wait

Browse Source
This commit is contained in:
Darien Raymond
2017-01-28 22:31:21 +01:00
parent fab20bb0cf
commit c09ca41161
9 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/shadowsocks/client.go
View File

@@ -113,7 +113,7 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay) error
return err
}
if err := buf.PipeUntilEOF(responseReader, outboundRay.OutboundOutput()); err != nil {
if err := buf.Pipe(responseReader, outboundRay.OutboundOutput()); err != nil {
return err
}
@@ -122,8 +122,6 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay) error
if err := signal.ErrorOrFinish2(ctx, requestDone, responseDone); err != nil {
log.Info("Shadowsocks|Client: Connection ends with ", err)
outboundRay.OutboundInput().CloseError()
outboundRay.OutboundOutput().CloseError()
return err
}
@@ -155,7 +153,7 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay) error
User: user,
}
if err := buf.PipeUntilEOF(reader, outboundRay.OutboundOutput()); err != nil {
if err := buf.Pipe(reader, outboundRay.OutboundOutput()); err != nil {
log.Info("Shadowsocks|Client: Failed to transport all UDP response: ", err)
return err
}

2
proxy/shadowsocks/server.go
View File

@@ -177,7 +177,7 @@ func (s *Server) handleConnection(ctx context.Context, conn internet.Connection)
return err
}
if err := buf.PipeUntilEOF(ray.InboundOutput(), responseWriter); err != nil {
if err := buf.Pipe(ray.InboundOutput(), responseWriter); err != nil {
log.Info("Shadowsocks|Server: Failed to transport all TCP response: ", err)
return err
}