Commit 563545bd authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Fix error handling at connection start.

parent 965b59c9
...@@ -110,10 +110,11 @@ func startClient(conn *websocket.Conn) (err error) { ...@@ -110,10 +110,11 @@ func startClient(conn *websocket.Conn) (err error) {
var m clientMessage var m clientMessage
err = conn.ReadJSON(&m) err = conn.ReadJSON(&m)
if err != nil { if err != nil {
conn.Close()
return return
} }
if m.Type != "handshake" { if m.Type != "handshake" {
err = protocolError("expected handshake") conn.Close()
return return
} }
...@@ -755,7 +756,7 @@ func clientLoop(c *client, conn *websocket.Conn) error { ...@@ -755,7 +756,7 @@ func clientLoop(c *client, conn *websocket.Conn) error {
Type: "permissions", Type: "permissions",
Permissions: c.permissions, Permissions: c.permissions,
}) })
if(!c.permissions.Present) { if !c.permissions.Present {
ids := getUpConns(c) ids := getUpConns(c)
for _, id := range ids { for _, id := range ids {
c.write(clientMessage{ c.write(clientMessage{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment