From 93b3e63e89594b2b7a05b791a5cfc366f10c763b Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 18 Jun 2023 13:40:26 +0300 Subject: add universal tcp message reader and writer --- internal/client/tcpclient.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'internal/client') diff --git a/internal/client/tcpclient.go b/internal/client/tcpclient.go index 1a76ad6..3181fd4 100644 --- a/internal/client/tcpclient.go +++ b/internal/client/tcpclient.go @@ -3,10 +3,10 @@ package client import ( "context" "fmt" - "io" "log" "net" + "codeberg.org/snonux/gorum/internal/tcp" "codeberg.org/snonux/gorum/internal/vote" ) @@ -29,18 +29,15 @@ func tcpClientRun(ctx context.Context, node string, ch <-chan vote.Vote) error { } log.Println("tcpclient: sending", message, "to node", node) - - bytes := []byte(fmt.Sprintf("%s\n", message)) - _, err = conn.Write(bytes) - if err != nil { + if err := tcp.WriteStr(conn, message); err != nil { return err } - response, err := io.ReadAll(conn) + response, err := tcp.ReadStr(conn) if err != nil { return err } - log.Println("tcpclient: received", string(response), "from node", node) + log.Println("tcpclient: received", response, "from node", node) } } -- cgit v1.2.3