bugfix in empty data

xtaci · xtaci · commit bcef39b34feb · 2019-03-22T02:22:31.000+08:00
diff --git a/kcp.go b/kcp.go
@@ -669,7 +669,7 @@ func (kcp *KCP) flush(ackOnly bool) uint32 {
 
 	if ackOnly { // flash remain ack segments
 		size := len(buffer) - len(ptr)
-		if size > 0 {
+		if size > kcp.keep {
 			kcp.output(buffer, size)
 		}
 		return kcp.interval
diff --git a/sess.go b/sess.go
@@ -142,7 +142,7 @@ func newUDPSession(conv uint32, dataShards, parityShards int, l *Listener, conn
 	}
 
 	sess.kcp = NewKCP(conv, func(buf []byte, size int) {
-		if size >= IKCP_OVERHEAD {
+		if size >= IKCP_OVERHEAD+sess.headerSize {
 			sess.output(buf[:size])
 		}
 	})

Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,7 @@ func (kcp *KCP) flush(ackOnly bool) uint32 {`
`669`	`669`
`670`	`670`	`if ackOnly { // flash remain ack segments`
`671`	`671`	`size := len(buffer) - len(ptr)`
`672`		`- if size > 0 {`
	`672`	`+ if size > kcp.keep {`
`673`	`673`	`kcp.output(buffer, size)`
`674`	`674`	`}`
`675`	`675`	`return kcp.interval`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ func newUDPSession(conv uint32, dataShards, parityShards int, l *Listener, conn`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`sess.kcp = NewKCP(conv, func(buf []byte, size int) {`
`145`		`- if size >= IKCP_OVERHEAD {`
	`145`	`+ if size >= IKCP_OVERHEAD+sess.headerSize {`
`146`	`146`	`sess.output(buf[:size])`
`147`	`147`	`}`
`148`	`148`	`})`