lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 23:47:07 -05:00
Code Issues Releases Wiki Activity

fix draining in mux

Browse Source
This commit is contained in:
Darien Raymond 2018-04-18 23:01:57 +02:00
parent 0ad4f99762
commit 8e62134bdf
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,20 +204,20 @@ func (m *Client) Dispatch(ctx context.Context, link *core.Link) bool {
return true return true
} }
func drain(reader *buf.BufferedReader) error { func drain(reader buf.Reader) error {
return buf.Copy(NewStreamReader(reader), buf.Discard) return buf.Copy(reader, buf.Discard)
} }
func (m *Client) handleStatueKeepAlive(meta *FrameMetadata, reader *buf.BufferedReader) error { func (m *Client) handleStatueKeepAlive(meta *FrameMetadata, reader *buf.BufferedReader) error {
if meta.Option.Has(OptionData) { if meta.Option.Has(OptionData) {
return drain(reader) return drain(NewStreamReader(reader))
} }
return nil return nil
} }
func (m *Client) handleStatusNew(meta *FrameMetadata, reader *buf.BufferedReader) error { func (m *Client) handleStatusNew(meta *FrameMetadata, reader *buf.BufferedReader) error {
if meta.Option.Has(OptionData) { if meta.Option.Has(OptionData) {
return drain(reader) return drain(NewStreamReader(reader))
} }
return nil return nil
} }
@ -228,14 +228,15 @@ func (m *Client) handleStatusKeep(meta *FrameMetadata, reader *buf.BufferedReade
} }
if s, found := m.sessionManager.Get(meta.SessionID); found { if s, found := m.sessionManager.Get(meta.SessionID); found {
if err := buf.Copy(s.NewReader(reader), s.output); err != nil { rr := s.NewReader(reader)
drain(reader) if err := buf.Copy(rr, s.output); err != nil {
drain(rr)
pipe.CloseError(s.input) pipe.CloseError(s.input)
return s.Close() return s.Close()
} }
return nil return nil
} }
return drain(reader) return drain(NewStreamReader(reader))
} }
func (m *Client) handleStatusEnd(meta *FrameMetadata, reader *buf.BufferedReader) error { func (m *Client) handleStatusEnd(meta *FrameMetadata, reader *buf.BufferedReader) error {
@ -247,7 +248,7 @@ func (m *Client) handleStatusEnd(meta *FrameMetadata, reader *buf.BufferedReader
s.Close() s.Close()
} }
if meta.Option.Has(OptionData) { if meta.Option.Has(OptionData) {
return drain(reader) return drain(NewStreamReader(reader))
} }
return nil return nil
} }
@ -346,7 +347,7 @@ func handle(ctx context.Context, s *Session, output buf.Writer) {
func (w *ServerWorker) handleStatusKeepAlive(meta *FrameMetadata, reader *buf.BufferedReader) error { func (w *ServerWorker) handleStatusKeepAlive(meta *FrameMetadata, reader *buf.BufferedReader) error {
if meta.Option.Has(OptionData) { if meta.Option.Has(OptionData) {
return drain(reader) return drain(NewStreamReader(reader))
} }
return nil return nil
} }
@ -367,7 +368,7 @@ func (w *ServerWorker) handleStatusNew(ctx context.Context, meta *FrameMetadata,
link, err := w.dispatcher.Dispatch(ctx, meta.Target) link, err := w.dispatcher.Dispatch(ctx, meta.Target)
if err != nil { if err != nil {
if meta.Option.Has(OptionData) { if meta.Option.Has(OptionData) {
drain(reader) drain(NewStreamReader(reader))
} }
return newError("failed to dispatch request.").Base(err) return newError("failed to dispatch request.").Base(err)
} }
@ -383,8 +384,15 @@ func (w *ServerWorker) handleStatusNew(ctx context.Context, meta *FrameMetadata,
} }
w.sessionManager.Add(s) w.sessionManager.Add(s)
go handle(ctx, s, w.link.Writer) go handle(ctx, s, w.link.Writer)
if meta.Option.Has(OptionData) { if !meta.Option.Has(OptionData) {
return buf.Copy(s.NewReader(reader), s.output, buf.IgnoreWriterError()) return nil
}
rr := s.NewReader(reader)
if err := buf.Copy(rr, s.output); err != nil {
drain(rr)
pipe.CloseError(s.input)
return s.Close()
} }
return nil return nil
} }
@ -394,14 +402,15 @@ func (w *ServerWorker) handleStatusKeep(meta *FrameMetadata, reader *buf.Buffere
return nil return nil
} }
if s, found := w.sessionManager.Get(meta.SessionID); found { if s, found := w.sessionManager.Get(meta.SessionID); found {
if err := buf.Copy(s.NewReader(reader), s.output); err != nil { rr := s.NewReader(reader)
drain(reader) if err := buf.Copy(rr, s.output); err != nil {
drain(rr)
pipe.CloseError(s.input) pipe.CloseError(s.input)
return s.Close() return s.Close()
} }
return nil return nil
} }
return drain(reader) return drain(NewStreamReader(reader))
} }
func (w *ServerWorker) handleStatusEnd(meta *FrameMetadata, reader *buf.BufferedReader) error { func (w *ServerWorker) handleStatusEnd(meta *FrameMetadata, reader *buf.BufferedReader) error {
@ -413,7 +422,7 @@ func (w *ServerWorker) handleStatusEnd(meta *FrameMetadata, reader *buf.Buffered
s.Close() s.Close()
} }
if meta.Option.Has(OptionData) { if meta.Option.Has(OptionData) {
return drain(reader) return drain(NewStreamReader(reader))
} }
return nil return nil
} }