lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-07-14 13:10:13 -04:00
Code Issues Releases Wiki Activity

remove NewMultiBufferValue

Browse Source
This commit is contained in:
Darien Raymond
2018-11-16 11:08:12 +01:00
parent db5259e75b
commit a01fdc29a6
21 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/mux/writer.go
View File

@@ -58,7 +58,7 @@ func (w *Writer) writeMetaOnly() error {
if err := meta.WriteTo(b); err != nil {
return err
}
return w.writer.WriteMultiBuffer(buf.NewMultiBufferValue(b))
return w.writer.WriteMultiBuffer(buf.MultiBuffer{b})
}
func writeMetaWithFrame(writer buf.Writer, meta FrameMetadata, data buf.MultiBuffer) error {
@@ -96,7 +96,7 @@ func (w *Writer) WriteMultiBuffer(mb buf.MultiBuffer) error {
if w.transferType == protocol.TransferTypeStream {
chunk = mb.SliceBySize(8 * 1024)
} else {
chunk = buf.NewMultiBufferValue(mb.SplitFirst())
chunk = buf.MultiBuffer{mb.SplitFirst()}
}
if err := w.writeData(chunk); err != nil {
return err
@@ -119,6 +119,6 @@ func (w *Writer) Close() error {
frame := buf.New()
common.Must(meta.WriteTo(frame))
w.writer.WriteMultiBuffer(buf.NewMultiBufferValue(frame)) // nolint: errcheck
w.writer.WriteMultiBuffer(buf.MultiBuffer{frame}) // nolint: errcheck
return nil
}