Refactor and cleanup to improve testability

[rbdr/mobius] / hotline / handshake.go

diff --git a/hotline/handshake.go b/hotline/handshake.go
index 66bf643dfbb921104a7e83afa1d13dff77ab2c9e..39d9cab4d489e5fbd78daa24d71225d9c240f4c9 100644 (file)
--- a/hotline/handshake.go
+++ b/hotline/handshake.go
@@ -4,7 +4,7 @@ import (
        "bytes"
        "encoding/binary"
        "errors"
-       "net"
+       "io"
 )
 
 type handshake struct {
@@ -33,9 +33,14 @@ type handshake struct {
 // Description         Size    Data    Note
 // Protocol ID         4               TRTP
 // Error code          4                               Error code returned by the server (0 = no error)
-func Handshake(conn net.Conn, buf []byte) error {
+func Handshake(conn io.ReadWriter) error {
+       handshakeBuf := make([]byte, 12)
+       if _, err := io.ReadFull(conn, handshakeBuf); err != nil {
+               return err
+       }
+
        var h handshake
-       r := bytes.NewReader(buf)
+       r := bytes.NewReader(handshakeBuf)
        if err := binary.Read(r, binary.BigEndian, &h); err != nil {
                return err
        }