From 158189ae7d58ff61cfa9adeb121280c6a4c9feb7 Mon Sep 17 00:00:00 2001 From: Jake W Date: Fri, 5 Aug 2022 11:15:05 +0100 Subject: [PATCH] Add client version as argument --- main.go | 6 ++---- main_test.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index 69b8105..c25b6ed 100644 --- a/main.go +++ b/main.go @@ -14,8 +14,6 @@ import ( "git.vh7.uk/jakew/echo-go/crypto" ) -const EchoVersion = "3.17" - func randomHex(n int) (string, error) { b := make([]byte, n) if _, err := rand.Read(b); err != nil { @@ -141,7 +139,7 @@ func (c *Client) Receive() ([]RawMessage, error) { return messages, nil } -func (c *Client) HandshakeLoop(password string) error { +func (c *Client) HandshakeLoop(clientVersion string, password string) error { log.Println("sending server info request") err := c.SendPlain(ReqServerInfo, nil, nil, nil) if err != nil { @@ -175,7 +173,7 @@ func (c *Client) HandshakeLoop(password string) error { data, err := json.Marshal([]string{ c.Username, password, - EchoVersion, + clientVersion, }) if err != nil { return err diff --git a/main_test.go b/main_test.go index d090ab0..7611ea9 100644 --- a/main_test.go +++ b/main_test.go @@ -8,7 +8,7 @@ func TestCanConnect(t *testing.T) { t.Fatalf("failed to create client: %v", err) } - err = client.handshakeLoop("mypassword") + err = client.HandshakeLoop("mypassword", "4.0.0") if err != nil { t.Fatalf("failed to run handshake loop: %v", err) }