archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make timeout constants into time.Duration values.

Browse source 
This slightly changes some log messages.
This commit is contained in:
David Fifield 2019-12-24 18:39:43 -07:00
parent dfb83c6606
commit a2292ce35b
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/lib/snowflake.go
View file

@ -6,11 +6,12 @@ import (
"log" "log"
"net" "net"
"sync" "sync"
"time"
) )
const ( const (
ReconnectTimeout = 10 ReconnectTimeout = 10 * time.Second
SnowflakeTimeout = 30 SnowflakeTimeout = 30 * time.Second
) )
// Given an accepted SOCKS connection, establish a WebRTC connection to the // Given an accepted SOCKS connection, establish a WebRTC connection to the

10
client/lib/webrtc.go
View file

@ -117,9 +117,9 @@ func (c *WebRTCPeer) checkForStaleness() {
if c.closed { if c.closed {
return return
} }
if time.Since(c.lastReceive).Seconds() > SnowflakeTimeout { if time.Since(c.lastReceive) > SnowflakeTimeout {
log.Println("WebRTC: No messages received for", SnowflakeTimeout, log.Printf("WebRTC: No messages received for %v -- closing stale connection.",
"seconds -- closing stale connection.") SnowflakeTimeout)
c.Close() c.Close()
return return
} }
@ -314,8 +314,8 @@ func (c *WebRTCPeer) exchangeSDP() error {
go c.sendOfferToBroker() go c.sendOfferToBroker()
answer, ok = <-c.answerChannel // Blocks... answer, ok = <-c.answerChannel // Blocks...
if !ok || nil == answer { if !ok || nil == answer {
log.Printf("Failed to retrieve answer. Retrying in %d seconds", ReconnectTimeout) log.Printf("Failed to retrieve answer. Retrying in %v", ReconnectTimeout)
<-time.After(time.Second * ReconnectTimeout) <-time.After(ReconnectTimeout)
answer = nil answer = nil
} }
} }

4
client/snowflake.go
View file

@ -31,11 +31,11 @@ func ConnectLoop(snowflakes sf.SnowflakeCollector) {
// Check if ending is necessary. // Check if ending is necessary.
_, err := snowflakes.Collect() _, err := snowflakes.Collect()
if err != nil { if err != nil {
log.Printf("WebRTC: %v Retrying in %v seconds...", log.Printf("WebRTC: %v Retrying in %v...",
err, sf.ReconnectTimeout) err, sf.ReconnectTimeout)
} }
select { select {
case <-time.After(time.Second * sf.ReconnectTimeout): case <-time.After(sf.ReconnectTimeout):
continue continue
case <-snowflakes.Melted(): case <-snowflakes.Melted():
log.Println("ConnectLoop: stopped.") log.Println("ConnectLoop: stopped.")