From 21b51cf0204a38a4e4c5b56e6c8ef236ebb21a2b Mon Sep 17 00:00:00 2001 From: matst80 Date: Thu, 21 Nov 2024 20:02:38 +0100 Subject: [PATCH] tcp jonny --- tcp-connection.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tcp-connection.go b/tcp-connection.go index 797313d..116ca35 100644 --- a/tcp-connection.go +++ b/tcp-connection.go @@ -1,7 +1,6 @@ package main import ( - "bufio" "encoding/binary" "fmt" "log" @@ -65,13 +64,13 @@ func NewConnection(address string) *Connection { } func SendFrame(conn net.Conn, data *FrameWithPayload) error { - w := bufio.NewWriter(conn) - err := binary.Write(w, binary.LittleEndian, data.Frame) + + err := binary.Write(conn, binary.LittleEndian, data.Frame) if err != nil { return err } - _, err = w.Write(data.Payload) - w.Flush() + _, err = conn.Write(data.Payload) + return err } @@ -117,15 +116,14 @@ func (c *Connection) Call(msg FrameType, data []byte) (*FrameWithPayload, error) func WaitForFrame(conn net.Conn, resultChan chan<- FrameWithPayload) error { var err error var frame Frame - r := bufio.NewReader(conn) - err = binary.Read(r, binary.LittleEndian, &frame) + err = binary.Read(conn, binary.LittleEndian, &frame) if err != nil { return err } if frame.IsValid() { payload := make([]byte, frame.Length) - _, err = r.Read(payload) + _, err = conn.Read(payload) if err != nil { return err }