octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Audrius Butkevicius 2016-11-11 22:23:48 +00:00 committed by Jakob Borg
parent f60b424d70
commit 38d28c3f4a
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syncthing/main.go
View File

@ -47,6 +47,8 @@ import (
"github.com/syncthing/syncthing/lib/upgrade"
"github.com/thejerf/suture"
_ "net/http/pprof" // Need to import this to support STPROFILER.
)
var (

3
lib/connections/relay_listen.go
View File

@ -44,6 +44,7 @@ func (t *relayListener) Serve() {
t.mut.Unlock()
clnt, err := client.NewClient(t.uri, t.tlsCfg.Certificates, nil, 10*time.Second)
invitations := clnt.Invitations()
if err != nil {
t.mut.Lock()
t.err = err
@ -62,7 +63,7 @@ func (t *relayListener) Serve() {
for {
select {
case inv, ok := <-t.client.Invitations():
case inv, ok := <-invitations:
if !ok {
return
}

3
lib/relay/client/dynamic.go
View File

@ -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)

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

@ -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)