lib/relay: Close invitation channel in all error cases (fixes #3726)

lib/relay/client/dynamic.go

@@ -48,6 +48,7 @@ func newDynamicClient(uri *url.URL, certs []tls.Certificate, invitations chan pr
 }
 
 func (c *dynamicClient) Serve() {
+	defer c.cleanup()
 	c.mut.Lock()
 	c.stop = make(chan struct{})
 	c.mut.Unlock()
@@ -75,8 +76,6 @@ func (c *dynamicClient) Serve() {
 		return
 	}
 
-	defer c.cleanup()
-
 	var addrs []string
 	for _, relayAnn := range ann.Relays {
 		ruri, err := url.Parse(relayAnn.URL)

lib/relay/client/static.go

@@ -63,6 +63,7 @@ func newStaticClient(uri *url.URL, certs []tls.Certificate, invitations chan pro
 }
 
 func (c *staticClient) Serve() {
+	defer c.cleanup()
 	c.stop = make(chan struct{})
 	c.stopped = make(chan struct{})
 	defer close(c.stopped)
@@ -156,10 +157,6 @@ func (c *staticClient) Serve() {
 			} else {
 				c.err = nil
 			}
-			if c.closeInvitationsOnFinish {
-				close(c.invitations)
-				c.invitations = make(chan protocol.SessionInvitation)
-			}
 			c.mut.Unlock()
 			return
 
@@ -209,6 +206,15 @@ func (c *staticClient) Invitations() chan protocol.SessionInvitation {
 	return inv
 }
 
+func (c *staticClient) cleanup() {
+	c.mut.Lock()
+	if c.closeInvitationsOnFinish {
+		close(c.invitations)
+		c.invitations = make(chan protocol.SessionInvitation)
+	}
+	c.mut.Unlock()
+}
+
 func (c *staticClient) connect() error {
 	if c.uri.Scheme != "relay" {
 		return fmt.Errorf("Unsupported relay schema: %v", c.uri.Scheme)