properly handle error case

v2ray · Apr 5, 2018 · 2b67533 · 2b67533
1 parent 61a1cce
commit 2b67533
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/proxyman/mux/mux.go b/app/proxyman/mux/mux.go
@@ -203,7 +203,11 @@ func (m *Client) handleStatusKeep(meta *FrameMetadata, reader *buf.BufferedReade
  }
 
  if s, found := m.sessionManager.Get(meta.SessionID); found {
- return buf.Copy(s.NewReader(reader), s.output, buf.IgnoreWriterError())
+ if err := buf.Copy(s.NewReader(reader), s.output); err != nil {
+ drain(reader)
+ s.input.CloseError()
+ return s.Close()
+ }
  }
  return drain(reader)
 }
@@ -359,7 +363,11 @@ func (w *ServerWorker) handleStatusKeep(meta *FrameMetadata, reader *buf.Buffere
  return nil
  }
  if s, found := w.sessionManager.Get(meta.SessionID); found {
- return buf.Copy(s.NewReader(reader), s.output, buf.IgnoreWriterError())
+ if err := buf.Copy(s.NewReader(reader), s.output); err != nil {
+ drain(reader)
+ s.input.CloseError()
+ return s.Close()
+ }
  }
  return drain(reader)
 }