github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix kcp for not sending data immediately

pull/861/head
Darien Raymond 2018-02-11 02:06:43 +01:00
parent 6f4bddd62e
commit 0a6a9547a0
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
transport/internet/kcp/connection.go
View File

@ -338,10 +338,15 @@ func (c *Connection) waitForDataOutput() error {
// Write implements io.Writer.
func (c *Connection) Write(b []byte) (int, error) {
totalWritten := 0
updatePending := false
defer func() {
if updatePending {
c.dataUpdater.WakeUp()
}
}()
for {
dataWritten := false
totalWritten := 0
for {
if c == nil || c.State() != StateActive {
return totalWritten, io.ErrClosedPipe
@ -354,15 +359,16 @@ func (c *Connection) Write(b []byte) (int, error) {
break
}
dataWritten = true
updatePending = true
if totalWritten == len(b) {
return totalWritten, nil
}
}
if dataWritten {
if updatePending {
c.dataUpdater.WakeUp()
updatePending = false
}
if err := c.waitForDataOutput(); err != nil {
@ -375,8 +381,14 @@ func (c *Connection) Write(b []byte) (int, error) {
func (c *Connection) WriteMultiBuffer(mb buf.MultiBuffer) error {
defer mb.Release()
updatePending := false
defer func() {
if updatePending {
c.dataUpdater.WakeUp()
}
}()
for {
dataWritten := false
for {
if c == nil || c.State() != StateActive {
return io.ErrClosedPipe
@ -387,14 +399,15 @@ func (c *Connection) WriteMultiBuffer(mb buf.MultiBuffer) error {
}) {
break
}
dataWritten = true
updatePending = true
if mb.IsEmpty() {
return nil
}
}
if dataWritten {
if updatePending {
c.dataUpdater.WakeUp()
updatePending = false
}
if err := c.waitForDataOutput(); err != nil {