From 807c12453c3578f9b8c5b97765c7ba62cf59ebbe Mon Sep 17 00:00:00 2001 From: Arceliar Date: Fri, 4 Oct 2019 19:25:32 -0500 Subject: [PATCH] simplify writeMsg slightly --- go.mod | 2 ++ src/yggdrasil/stream.go | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index d86101bf..66b4f5d4 100644 --- a/go.mod +++ b/go.mod @@ -17,3 +17,5 @@ require ( golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a golang.org/x/text v0.3.2 ) + +go 1.13 diff --git a/src/yggdrasil/stream.go b/src/yggdrasil/stream.go index 472368b9..76668f17 100644 --- a/src/yggdrasil/stream.go +++ b/src/yggdrasil/stream.go @@ -38,12 +38,9 @@ func (s *stream) init(rwc io.ReadWriteCloser) { func (s *stream) writeMsg(bs []byte) (int, error) { s.outputBuffer.Write(streamMsg[:]) s.outputBuffer.Write(wire_encode_uint64(uint64(len(bs)))) - n, err := s.outputBuffer.Write(bs) - err2 := s.outputBuffer.Flush() - if err == nil { - err = err2 - } - return n, err + s.outputBuffer.Write(bs) + s.outputBuffer.Flush() // TODO? delay flushing until we're idle + return len(bs), nil // TODO? return an error? its not like we check for it... } // readMsg reads a message from the stream, accounting for stream padding, and is *not* thread safe.