lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-27 01:45:23 +00:00
Code Issues Releases Wiki Activity

handle transport errors in mux session

Browse Source
This commit is contained in:
Darien Raymond 2018-04-04 17:20:45 +02:00
parent a3f47f4fa2
commit 90c6113dfc
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
3 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/proxyman/mux/frame.go
View File

@ -15,6 +15,7 @@ const (
SessionStatusKeep SessionStatus = 0x02
SessionStatusEnd SessionStatus = 0x03
SessionStatusKeepAlive SessionStatus = 0x04
SessionStatusError SessionStatus = 0x05
)
const (

36
app/proxyman/mux/mux.go
View File

@ -146,12 +146,14 @@ func fetchInput(ctx context.Context, s *Session, output buf.Writer) {
}
s.transferType = transferType
writer := NewWriter(s.ID, dest, output, transferType)
defer writer.Close()
defer s.Close()
newError("dispatching request to ", dest).WithContext(ctx).WriteToLog()
if err := buf.Copy(s.input, writer); err != nil {
newError("failed to fetch all input").Base(err).WithContext(ctx).WriteToLog()
writer.Error()
} else {
writer.Close()
}
}
@ -214,6 +216,18 @@ func (m *Client) handleStatusEnd(meta *FrameMetadata, reader *buf.BufferedReader
return nil
}
func (m *Client) handleStatusError(meta *FrameMetadata, reader *buf.BufferedReader) error {
if s, found := m.sessionManager.Get(meta.SessionID); found {
s.output.CloseError()
s.input.CloseError()
s.Close()
}
if meta.Option.Has(OptionData) {
return drain(reader)
}
return nil
}
func (m *Client) fetchOutput() {
defer m.done.Close()
@ -237,6 +251,8 @@ func (m *Client) fetchOutput() {
err = m.handleStatusNew(meta, reader)
case SessionStatusKeep:
err = m.handleStatusKeep(meta, reader)
case SessionStatusError:
err = m.handleStatusError(meta, reader)
default:
newError("unknown status: ", meta.SessionStatus).AtError().WriteToLog()
return
@ -294,8 +310,10 @@ func handle(ctx context.Context, s *Session, output buf.Writer) {
writer := NewResponseWriter(s.ID, output, s.transferType)
if err := buf.Copy(s.input, writer); err != nil {
newError("session ", s.ID, " ends.").Base(err).WithContext(ctx).WriteToLog()
writer.Error()
} else {
writer.Close()
}
writer.Close()
s.Close()
}
@ -353,6 +371,18 @@ func (w *ServerWorker) handleStatusEnd(meta *FrameMetadata, reader *buf.Buffered
return nil
}
func (w *ServerWorker) handleStatusError(meta *FrameMetadata, reader *buf.BufferedReader) error {
if s, found := w.sessionManager.Get(meta.SessionID); found {
s.input.CloseError()
s.output.CloseError()
s.Close()
}
if meta.Option.Has(OptionData) {
return drain(reader)
}
return nil
}
func (w *ServerWorker) handleFrame(ctx context.Context, reader *buf.BufferedReader) error {
meta, err := ReadMetadata(reader)
if err != nil {
@ -368,6 +398,8 @@ func (w *ServerWorker) handleFrame(ctx context.Context, reader *buf.BufferedRead
err = w.handleStatusNew(ctx, meta, reader)
case SessionStatusKeep:
err = w.handleStatusKeep(meta, reader)
case SessionStatusError:
err = w.handleStatusError(meta, reader)
default:
return newError("unknown status: ", meta.SessionStatus).AtError()
}

13
app/proxyman/mux/writer.go
View File

@ -112,3 +112,16 @@ func (w *Writer) Close() error {
w.writer.WriteMultiBuffer(buf.NewMultiBufferValue(frame))
return nil
}
func (w *Writer) Error() error {
meta := FrameMetadata{
SessionID: w.id,
SessionStatus: SessionStatusError,
}
frame := buf.New()
common.Must(meta.WriteTo(frame))
w.writer.WriteMultiBuffer(buf.NewMultiBufferValue(frame))
return nil
}