mirror of https://github.com/v2ray/v2ray-core
fix kcp write
parent
53b0f91873
commit
19a0d21cb6
|
@ -335,7 +335,7 @@ func (v *Connection) Read(b []byte) (int, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write implements the Conn Write method.
|
// Write implements io.Writer.
|
||||||
func (v *Connection) Write(b []byte) (int, error) {
|
func (v *Connection) Write(b []byte) (int, error) {
|
||||||
totalWritten := 0
|
totalWritten := 0
|
||||||
|
|
||||||
|
@ -352,6 +352,7 @@ func (v *Connection) Write(b []byte) (int, error) {
|
||||||
common.Must(rb.Reset(func(bb []byte) (int, error) {
|
common.Must(rb.Reset(func(bb []byte) (int, error) {
|
||||||
return copy(bb[:v.mss], b[totalWritten:]), nil
|
return copy(bb[:v.mss], b[totalWritten:]), nil
|
||||||
}))
|
}))
|
||||||
|
v.dataUpdater.WakeUp()
|
||||||
totalWritten += rb.Len()
|
totalWritten += rb.Len()
|
||||||
if totalWritten == len(b) {
|
if totalWritten == len(b) {
|
||||||
return totalWritten, nil
|
return totalWritten, nil
|
||||||
|
@ -376,6 +377,7 @@ func (v *Connection) Write(b []byte) (int, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WriteMultiBuffer implements buf.Writer.
|
||||||
func (v *Connection) WriteMultiBuffer(mb buf.MultiBuffer) error {
|
func (v *Connection) WriteMultiBuffer(mb buf.MultiBuffer) error {
|
||||||
defer mb.Release()
|
defer mb.Release()
|
||||||
|
|
||||||
|
@ -392,6 +394,7 @@ func (v *Connection) WriteMultiBuffer(mb buf.MultiBuffer) error {
|
||||||
common.Must(rb.Reset(func(bb []byte) (int, error) {
|
common.Must(rb.Reset(func(bb []byte) (int, error) {
|
||||||
return mb.Read(bb[:v.mss])
|
return mb.Read(bb[:v.mss])
|
||||||
}))
|
}))
|
||||||
|
v.dataUpdater.WakeUp()
|
||||||
if mb.IsEmpty() {
|
if mb.IsEmpty() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -288,15 +288,15 @@ func (v *SendingWorker) Push() *buf.Buffer {
|
||||||
v.Lock()
|
v.Lock()
|
||||||
defer v.Unlock()
|
defer v.Unlock()
|
||||||
|
|
||||||
if !v.window.IsFull() {
|
if v.window.IsFull() {
|
||||||
b := v.window.Push(v.nextNumber)
|
return nil
|
||||||
v.nextNumber++
|
|
||||||
return b
|
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
|
b := v.window.Push(v.nextNumber)
|
||||||
|
v.nextNumber++
|
||||||
|
return b
|
||||||
}
|
}
|
||||||
|
|
||||||
// Private: Visible for testing.
|
|
||||||
func (v *SendingWorker) Write(seg Segment) error {
|
func (v *SendingWorker) Write(seg Segment) error {
|
||||||
dataSeg := seg.(*DataSegment)
|
dataSeg := seg.(*DataSegment)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue