Martchus/syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Receive the invite, otherwise stop blocks, add extra arguments

Browse Source
This commit is contained in:
AudriusButkevicius 2015-09-06 20:25:53 +01:00
parent 25d0a363a8
commit 24bcf6a088
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/relaysrv/client/methods.go
View File

@ -98,13 +98,17 @@ func JoinSession(invitation protocol.SessionInvitation) (net.Conn, error) {
} }
} }
func TestRelay(uri *url.URL, certs []tls.Certificate) bool { func TestRelay(uri *url.URL, certs []tls.Certificate, sleep time.Duration, times int) bool {
id := syncthingprotocol.NewDeviceID(certs[0].Certificate[0]) id := syncthingprotocol.NewDeviceID(certs[0].Certificate[0])
c := NewProtocolClient(uri, certs, nil) invs := make(chan protocol.SessionInvitation, 1)
c := NewProtocolClient(uri, certs, invs)
go c.Serve() go c.Serve()
defer c.Stop() defer func() {
close(invs)
c.Stop()
}()
for i := 0; i < 5; i++ { for i := 0; i < times; i++ {
_, err := GetInvitationFromRelay(uri, id, certs) _, err := GetInvitationFromRelay(uri, id, certs)
if err == nil { if err == nil {
return true return true
@ -112,7 +116,7 @@ func TestRelay(uri *url.URL, certs []tls.Certificate) bool {
if !strings.Contains(err.Error(), "Incorrect response code") { if !strings.Contains(err.Error(), "Incorrect response code") {
return false return false
} }
time.Sleep(time.Second) time.Sleep(sleep)
} }
return false return false
} }