lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-09-23 10:44:03 -04:00
Code Issues Releases Wiki Activity

fix usage of ray stream.

Browse Source
This commit is contained in:
Darien Raymond
2016-12-30 00:51:39 +01:00
parent 609dbc1f13
commit f6aa7a0053
9 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
proxy/dokodemo/dokodemo.go
View File

@@ -167,7 +167,8 @@ func (v *DokodemoDoor) HandleTCPConnection(conn internet.Connection) {
Destination: dest,
Inbound: v.meta,
})
defer ray.InboundOutput().Release()
output := ray.InboundOutput()
defer output.ForceClose()
reader := v2net.NewTimeOutReader(v.config.Timeout, conn)
defer reader.Release()
@@ -187,19 +188,21 @@ func (v *DokodemoDoor) HandleTCPConnection(conn internet.Connection) {
})
responseDone := signal.ExecuteAsync(func() error {
defer ray.InboundOutput().Release()
defer output.ForceClose()
v2writer := buf.NewWriter(conn)
defer v2writer.Release()
if err := buf.PipeUntilEOF(ray.InboundOutput(), v2writer); err != nil {
if err := buf.PipeUntilEOF(output, v2writer); err != nil {
log.Info("Dokodemo: Failed to transport all TCP response: ", err)
return err
}
return nil
})
signal.ErrorOrFinish2(requestDone, responseDone)
if err := signal.ErrorOrFinish2(requestDone, responseDone); err != nil {
log.Info("Dokodemo: Connection ends with ", err)
}
}
type Factory struct{}