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

rename CloseError() to Interrupt()

Browse Source
This commit is contained in:
Darien Raymond
2018-12-31 21:25:10 +01:00
parent d35c407419
commit 3de8389361
21 changed files with 66 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/mux/server.go
View File

@@ -5,6 +5,7 @@ import (
"io"
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/log"
@@ -146,7 +147,7 @@ func (w *ServerWorker) handleStatusNew(ctx context.Context, meta *FrameMetadata,
rr := s.NewReader(reader)
if err := buf.Copy(rr, s.output); err != nil {
buf.Copy(rr, buf.Discard)
pipe.CloseError(s.input)
common.Interrupt(s.input)
return s.Close()
}
return nil
@@ -177,7 +178,7 @@ func (w *ServerWorker) handleStatusKeep(meta *FrameMetadata, reader *buf.Buffere
closingWriter.Close()
drainErr := buf.Copy(rr, buf.Discard)
pipe.CloseError(s.input)
common.Interrupt(s.input)
s.Close()
return drainErr
}
@@ -188,8 +189,8 @@ func (w *ServerWorker) handleStatusKeep(meta *FrameMetadata, reader *buf.Buffere
func (w *ServerWorker) handleStatusEnd(meta *FrameMetadata, reader *buf.BufferedReader) error {
if s, found := w.sessionManager.Get(meta.SessionID); found {
if meta.Option.Has(OptionError) {
pipe.CloseError(s.input)
pipe.CloseError(s.output)
common.Interrupt(s.input)
common.Interrupt(s.output)
}
s.Close()
}
@@ -241,7 +242,7 @@ func (w *ServerWorker) run(ctx context.Context) {
if err != nil {
if errors.Cause(err) != io.EOF {
newError("unexpected EOF").Base(err).WriteToLog(session.ExportIDToError(ctx))
pipe.CloseError(input)
common.Interrupt(input)
}
return
}