Browse Source

Revert "Fix buffer leak in mkcp transport protocol (#3347)"

This reverts commit d2b2f8c1f3d67134d78e79f1b82d7fd7a45cc0af.
Shelikhoo 6 months ago
parent
commit
d565c48690
2 changed files with 1 additions and 13 deletions
  1. 1 4
      transport/internet/kcp/connection.go
  2. 0 9
      transport/internet/kcp/output.go

+ 1 - 4
transport/internet/kcp/connection.go

@@ -390,9 +390,7 @@ func (c *Connection) writeMultiBufferInternal(reader io.Reader) error {
 	}()
 	}()
 
 
 	var b *buf.Buffer
 	var b *buf.Buffer
-	defer func() {
-		b.Release()
-	}()
+	defer b.Release()
 
 
 	for {
 	for {
 		for {
 		for {
@@ -539,7 +537,6 @@ func (c *Connection) Terminate() {
 	c.closer.Close()
 	c.closer.Close()
 	c.sendingWorker.Release()
 	c.sendingWorker.Release()
 	c.receivingWorker.Release()
 	c.receivingWorker.Release()
-	c.output.Release()
 }
 }
 
 
 func (c *Connection) HandleOption(opt SegmentOption) {
 func (c *Connection) HandleOption(opt SegmentOption) {

+ 0 - 9
transport/internet/kcp/output.go

@@ -10,7 +10,6 @@ import (
 
 
 type SegmentWriter interface {
 type SegmentWriter interface {
 	Write(seg Segment) error
 	Write(seg Segment) error
-	Release()
 }
 }
 
 
 type SimpleSegmentWriter struct {
 type SimpleSegmentWriter struct {
@@ -37,10 +36,6 @@ func (w *SimpleSegmentWriter) Write(seg Segment) error {
 	return err
 	return err
 }
 }
 
 
-func (w *SimpleSegmentWriter) Release() {
-	w.buffer.Release()
-}
-
 type RetryableWriter struct {
 type RetryableWriter struct {
 	writer SegmentWriter
 	writer SegmentWriter
 }
 }
@@ -56,7 +51,3 @@ func (w *RetryableWriter) Write(seg Segment) error {
 		return w.writer.Write(seg)
 		return w.writer.Write(seg)
 	})
 	})
 }
 }
-
-func (w *RetryableWriter) Release() {
-	w.writer.Release()
-}