From 35e143094ecc28f3dd1f3d96bf074c70aa005a9a Mon Sep 17 00:00:00 2001
From: Lennart Buhl <git@hackmate.de>
Date: Sat, 6 Feb 2016 15:18:07 +0100
Subject: [PATCH] move Handshake to data/network.go

---
 cmd/client.go   | 2 +-
 cmd/cmd.go      | 2 --
 cmd/server.go   | 2 +-
 data/network.go | 8 +++++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/client.go b/cmd/client.go
index 39facee..1f86e8f 100644
--- a/cmd/client.go
+++ b/cmd/client.go
@@ -30,7 +30,7 @@ var (
 func register(con net.Conn, id int) error {
 	w, h := 0, 0               //data.TestNC()
 	enc := gob.NewEncoder(con) // Encoder
-	err := enc.Encode(handshake{ID: id, H: h, W: w})
+	err := enc.Encode(data.Handshake{ID: id, H: h, W: w})
 	return err
 }
 
diff --git a/cmd/cmd.go b/cmd/cmd.go
index c83b477..0041537 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -6,8 +6,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type handshake struct{ ID, W, H int }
-
 var CmdGosl = &cobra.Command{
 	Use:   "gosl [command]",
 	Short: "Run a gosl instance",
diff --git a/cmd/server.go b/cmd/server.go
index c96a832..ce89735 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -39,7 +39,7 @@ var clients map[int]goslClient = make(map[int]goslClient)
 var clientKeys []int = make([]int, 100)
 
 func handleConn(conn *net.TCPConn) {
-	var hs handshake
+	var hs data.Handshake
 	log.Println("Got a connection!")
 	// handshake
 	dec := gob.NewDecoder(conn) // Decoder
diff --git a/data/network.go b/data/network.go
index eac611a..692b2e6 100644
--- a/data/network.go
+++ b/data/network.go
@@ -5,10 +5,12 @@ import (
 )
 
 type Handshake struct {
-	Client int
-	Name   string
+	ID int
+	//	Name   string
+	W int
+	H int
 }
 
 func (h Handshake) String() string {
-	return (h.Name + ": " + strconv.Itoa(h.Client))
+	return (strconv.Itoa(h.ID) + ": " + strconv.Itoa(h.W) + "×" + strconv.Itoa(h.H))
 }