From 397ceea34cf28ec3fb4662f03623bfccef3a6952 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Wed, 26 Sep 2018 06:36:47 -0700 Subject: [PATCH] revert --- src/tcp/tcp.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go index ba21f74..4177f77 100644 --- a/src/tcp/tcp.go +++ b/src/tcp/tcp.go @@ -126,15 +126,19 @@ func chanFromConn(conn net.Conn) chan []byte { c := make(chan []byte) go func() { + b := make([]byte, models.TCP_BUFFER_SIZE) for { - b := make([]byte, models.TCP_BUFFER_SIZE) - _, err := conn.Read(b) + n, err := conn.Read(b) + if n > 0 { + res := make([]byte, n) + // Copy the buffer so it doesn't get changed while read by the recipient. + copy(res, b[:n]) + c <- res + } if err != nil { c <- nil break - } else { - c <- b } } }()