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

handle nil onData

Browse Source
This commit is contained in:
Darien Raymond 2017-04-27 23:33:07 +02:00
parent 6f3362fc4c
commit 3821ee21fc
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/buf/io.go
View File

@ -53,6 +53,22 @@ type copyHandler struct {
onWriteError func(error) error
}
func (h *copyHandler) readFrom(reader Reader) (MultiBuffer, error) {
mb, err := reader.Read()
if err != nil && h.onReadError != nil {
err = h.onReadError(err)
}
return mb, err
}
func (h *copyHandler) writeTo(writer Writer, mb MultiBuffer) error {
err := writer.Write(mb)
if err != nil && h.onWriteError != nil {
err = h.onWriteError(err)
}
return err
}
type CopyOption func(*copyHandler)
func IgnoreReaderError() CopyOption {
@ -79,27 +95,25 @@ func UpdateActivity(timer signal.ActivityTimer) CopyOption {
}
}
func copyInternal(reader Reader, writer Writer, handler copyHandler) error {
func copyInternal(reader Reader, writer Writer, handler *copyHandler) error {
for {
buffer, err := reader.Read()
buffer, err := handler.readFrom(reader)
if err != nil {
if err = handler.onReadError(err); err != nil {
return err
}
return err
}
handler.onData()
if buffer.IsEmpty() {
buffer.Release()
continue
}
if err := writer.Write(buffer); err != nil {
if err = handler.onWriteError(err); err != nil {
buffer.Release()
return err
}
if handler.onData != nil {
handler.onData()
}
if err := handler.writeTo(writer, buffer); err != nil {
buffer.Release()
return err
}
}
}
@ -107,9 +121,9 @@ func copyInternal(reader Reader, writer Writer, handler copyHandler) error {
// Copy dumps all payload from reader to writer or stops when an error occurs.
// ActivityTimer gets updated as soon as there is a payload.
func Copy(reader Reader, writer Writer, options ...CopyOption) error {
handler := copyHandler{}
handler := new(copyHandler)
for _, option := range options {
option(&handler)
option(handler)
}
err := copyInternal(reader, writer, handler)
if err != nil && errors.Cause(err) != io.EOF {