mirror of
https://github.com/jech/galene.git
synced 2024-11-22 00:25:58 +01:00
Fix error handling at connection start.
This commit is contained in:
parent
965b59c9d5
commit
563545bd13
1 changed files with 4 additions and 3 deletions
|
@ -110,10 +110,11 @@ func startClient(conn *websocket.Conn) (err error) {
|
|||
var m clientMessage
|
||||
err = conn.ReadJSON(&m)
|
||||
if err != nil {
|
||||
conn.Close()
|
||||
return
|
||||
}
|
||||
if m.Type != "handshake" {
|
||||
err = protocolError("expected handshake")
|
||||
conn.Close()
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -755,12 +756,12 @@ func clientLoop(c *client, conn *websocket.Conn) error {
|
|||
Type: "permissions",
|
||||
Permissions: c.permissions,
|
||||
})
|
||||
if(!c.permissions.Present) {
|
||||
if !c.permissions.Present {
|
||||
ids := getUpConns(c)
|
||||
for _, id := range ids {
|
||||
c.write(clientMessage{
|
||||
Type: "abort",
|
||||
Id: id,
|
||||
Id: id,
|
||||
})
|
||||
delUpConn(c, id)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue