Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Anti-censorship
Pluggable Transports
Snowflake
Commits
a2292ce3
Commit
a2292ce3
authored
Dec 24, 2019
by
David Fifield
Browse files
Make timeout constants into time.Duration values.
This slightly changes some log messages.
parent
dfb83c66
Changes
3
Hide whitespace changes
Inline
Side-by-side
client/lib/snowflake.go
View file @
a2292ce3
...
...
@@ -6,11 +6,12 @@ import (
"log"
"net"
"sync"
"time"
)
const
(
ReconnectTimeout
=
10
SnowflakeTimeout
=
30
ReconnectTimeout
=
10
*
time
.
Second
SnowflakeTimeout
=
30
*
time
.
Second
)
// Given an accepted SOCKS connection, establish a WebRTC connection to the
...
...
client/lib/webrtc.go
View file @
a2292ce3
...
...
@@ -117,9 +117,9 @@ func (c *WebRTCPeer) checkForStaleness() {
if
c
.
closed
{
return
}
if
time
.
Since
(
c
.
lastReceive
)
.
Seconds
()
>
SnowflakeTimeout
{
log
.
Print
ln
(
"WebRTC: No messages received for
"
,
SnowflakeTimeout
,
"seconds -- closing stale connection."
)
if
time
.
Since
(
c
.
lastReceive
)
>
SnowflakeTimeout
{
log
.
Print
f
(
"WebRTC: No messages received for
%v -- closing stale connection."
,
SnowflakeTimeout
)
c
.
Close
()
return
}
...
...
@@ -314,8 +314,8 @@ func (c *WebRTCPeer) exchangeSDP() error {
go
c
.
sendOfferToBroker
()
answer
,
ok
=
<-
c
.
answerChannel
// Blocks...
if
!
ok
||
nil
==
answer
{
log
.
Printf
(
"Failed to retrieve answer. Retrying in %
d seconds
"
,
ReconnectTimeout
)
<-
time
.
After
(
time
.
Second
*
ReconnectTimeout
)
log
.
Printf
(
"Failed to retrieve answer. Retrying in %
v
"
,
ReconnectTimeout
)
<-
time
.
After
(
ReconnectTimeout
)
answer
=
nil
}
}
...
...
client/snowflake.go
View file @
a2292ce3
...
...
@@ -31,11 +31,11 @@ func ConnectLoop(snowflakes sf.SnowflakeCollector) {
// Check if ending is necessary.
_
,
err
:=
snowflakes
.
Collect
()
if
err
!=
nil
{
log
.
Printf
(
"WebRTC: %v Retrying in %v
seconds
..."
,
log
.
Printf
(
"WebRTC: %v Retrying in %v..."
,
err
,
sf
.
ReconnectTimeout
)
}
select
{
case
<-
time
.
After
(
time
.
Second
*
sf
.
ReconnectTimeout
)
:
case
<-
time
.
After
(
sf
.
ReconnectTimeout
)
:
continue
case
<-
snowflakes
.
Melted
()
:
log
.
Println
(
"ConnectLoop: stopped."
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment