octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-23 07:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2595 from AudriusButkevicius/leaks

Browse Source 
Always exit via error select, making sure reader routine is exits (fi…
This commit is contained in:
Jakob Borg 2015-12-20 10:03:34 +01:00
commit 394c2b67d6
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/relay/client/static.go
View File

@ -88,7 +88,6 @@ func (c *staticClient) Serve() {
l.Debugln(c, "joined", c.conn.RemoteAddr(), "via", c.conn.LocalAddr()) l.Debugln(c, "joined", c.conn.RemoteAddr(), "via", c.conn.LocalAddr())
defer c.cleanup()
c.mut.Lock() c.mut.Lock()
c.connected = true c.connected = true
c.mut.Unlock() c.mut.Unlock()
@ -110,10 +109,10 @@ func (c *staticClient) Serve() {
case protocol.Ping: case protocol.Ping:
if err := protocol.WriteMessage(c.conn, protocol.Pong{}); err != nil { if err := protocol.WriteMessage(c.conn, protocol.Pong{}); err != nil {
l.Infoln("Relay write:", err) l.Infoln("Relay write:", err)
return c.disconnect()
} else {
l.Debugln(c, "sent pong")
} }
l.Debugln(c, "sent pong")
case protocol.SessionInvitation: case protocol.SessionInvitation:
ip := net.IP(msg.Address) ip := net.IP(msg.Address)
@ -124,24 +123,38 @@ func (c *staticClient) Serve() {
case protocol.RelayFull: case protocol.RelayFull:
l.Infoln("Disconnected from relay due to it becoming full.") l.Infoln("Disconnected from relay due to it becoming full.")
return c.disconnect()
default: default:
l.Infoln("Relay: protocol error: unexpected message %v", msg) l.Infoln("Relay: protocol error: unexpected message %v", msg)
return c.disconnect()
} }
case <-c.stop: case <-c.stop:
l.Debugln(c, "stopping") l.Debugln(c, "stopping")
return c.disconnect()
// We always exit via this branch of the select, to make sure the
// the reader routine exits.
case err := <-errors: case err := <-errors:
l.Infoln("Relay received:", err) close(errors)
close(messages)
c.mut.Lock()
if c.connected {
c.conn.Close()
c.connected = false
l.Infoln("Relay received:", err)
}
if c.closeInvitationsOnFinish {
close(c.invitations)
c.invitations = make(chan protocol.SessionInvitation)
}
c.mut.Unlock()
return return
case <-timeout.C: case <-timeout.C:
l.Debugln(c, "timed out") l.Debugln(c, "timed out")
return c.disconnect()
} }
} }
} }
@ -215,13 +228,9 @@ func (c *staticClient) connect() error {
return nil return nil
} }
func (c *staticClient) cleanup() { func (c *staticClient) disconnect() {
l.Debugln(c, "cleaning up") l.Debugln(c, "disconnecting")
c.mut.Lock() c.mut.Lock()
if c.closeInvitationsOnFinish {
close(c.invitations)
c.invitations = make(chan protocol.SessionInvitation)
}
c.connected = false c.connected = false
c.mut.Unlock() c.mut.Unlock()