From 800f849a7833808336bd55adf0c0b1831acc619e Mon Sep 17 00:00:00 2001 From: Lennart Buhl Date: Sat, 6 Feb 2016 21:47:06 +0100 Subject: [PATCH] deregistering for clients --- cmd/server.go | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/cmd/server.go b/cmd/server.go index 87c9049..09c4b78 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -42,9 +42,8 @@ var clientKeys []int = make([]int, 100) func handleConn(conn *net.TCPConn) { var hs data.Handshake log.Println("Got a connection!") - // handshake - dec := gob.NewDecoder(conn) // Decoder - dec.Decode(&hs) + dec := gob.NewDecoder(conn) + dec.Decode(&hs) // decode handshake log.Println("Got client! ID:", hs.ID, "dimensions:", hs.W, hs.H) clientKeys = append(clientKeys, hs.ID) sort.Ints(clientKeys) @@ -69,8 +68,23 @@ func serveClients() { id, client := k, clients[k] if id > 0 { enc := gob.NewEncoder(client.con) - enc.Encode(oFrame) + err := enc.Encode(oFrame) + if err != nil { + // client disconnected + //log.Println("BEFORE remove: clients:", clients, " clientKeys:", clientKeys) + + // delete client + delete(clients, client.id) + + // delete client key + // ugly as fuck in go to remove from a slice + // it *should* work though + idInKeys := sort.SearchInts(clientKeys, client.id) + clientKeys = append(clientKeys[:idInKeys], clientKeys[idInKeys+1:]...) + + //log.Println("AFTER remove: clients:", clients, " clientKeys:", clientKeys) + } //log.Println("ID:", id, "Client:", client) } }