mirror of
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
synced 2025-10-13 20:11:19 -04:00
snowflake reset works correctly without copy paste condition,
and use default broker poll interval of 5s
This commit is contained in:
parent
0301ff1879
commit
e1f6c7fc5d
3 changed files with 9 additions and 8 deletions
|
@ -21,5 +21,5 @@ Here are optional parameters to include in the query string.
|
||||||
```
|
```
|
||||||
manual - enables copy-paste signalling mode.
|
manual - enables copy-paste signalling mode.
|
||||||
relay=<address> - use a custom target relay.
|
relay=<address> - use a custom target relay.
|
||||||
broker=<address> - use a custom broker.
|
broker=<url> - use a custom broker.
|
||||||
```
|
```
|
||||||
|
|
|
@ -12,9 +12,6 @@ DEFAULT_RELAY =
|
||||||
host: '192.81.135.242'
|
host: '192.81.135.242'
|
||||||
port: 9901
|
port: 9901
|
||||||
COPY_PASTE_ENABLED = false
|
COPY_PASTE_ENABLED = false
|
||||||
DEFAULT_PORTS =
|
|
||||||
http: 80
|
|
||||||
https: 443
|
|
||||||
|
|
||||||
DEBUG = false
|
DEBUG = false
|
||||||
query = null
|
query = null
|
||||||
|
@ -29,6 +26,7 @@ HEADLESS = 'undefined' == typeof(document)
|
||||||
DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined
|
DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined
|
||||||
MIN_RATE_LIMIT = 10 * 1024
|
MIN_RATE_LIMIT = 10 * 1024
|
||||||
RATE_LIMIT_HISTORY = 5.0
|
RATE_LIMIT_HISTORY = 5.0
|
||||||
|
DEFAULT_BROKER_POLL_INTERVAL = 5.0 * 1000
|
||||||
|
|
||||||
MAX_NUM_CLIENTS = 1
|
MAX_NUM_CLIENTS = 1
|
||||||
CONNECTIONS_PER_CLIENT = 1
|
CONNECTIONS_PER_CLIENT = 1
|
||||||
|
@ -92,12 +90,12 @@ class Snowflake
|
||||||
return true
|
return true
|
||||||
|
|
||||||
# Initialize WebRTC PeerConnection
|
# Initialize WebRTC PeerConnection
|
||||||
beginWebRTC: (automatic) ->
|
beginWebRTC: ->
|
||||||
@state = MODE.WEBRTC_CONNECTING
|
@state = MODE.WEBRTC_CONNECTING
|
||||||
for i in [1..CONNECTIONS_PER_CLIENT]
|
for i in [1..CONNECTIONS_PER_CLIENT]
|
||||||
@makeProxyPair @relayAddr
|
@makeProxyPair @relayAddr
|
||||||
@proxyPair = @proxyPairs[0]
|
@proxyPair = @proxyPairs[0]
|
||||||
return if !automatic
|
return if COPY_PASTE_ENABLED
|
||||||
# Poll broker for clients.
|
# Poll broker for clients.
|
||||||
findClients = =>
|
findClients = =>
|
||||||
recv = broker.getClientOffer()
|
recv = broker.getClientOffer()
|
||||||
|
@ -107,7 +105,7 @@ class Snowflake
|
||||||
@receiveOffer offer
|
@receiveOffer offer
|
||||||
, (err) ->
|
, (err) ->
|
||||||
log err
|
log err
|
||||||
setTimeout(findClients, 1000)
|
setTimeout(findClients, DEFAULT_BROKER_POLL_INTERVAL)
|
||||||
findClients()
|
findClients()
|
||||||
|
|
||||||
# Receive an SDP offer from some client assigned by the Broker.
|
# Receive an SDP offer from some client assigned by the Broker.
|
||||||
|
@ -233,6 +231,6 @@ init = ->
|
||||||
|
|
||||||
relayAddr = Params.getAddress(query, 'relay', DEFAULT_RELAY)
|
relayAddr = Params.getAddress(query, 'relay', DEFAULT_RELAY)
|
||||||
snowflake.setRelayAddr relayAddr
|
snowflake.setRelayAddr relayAddr
|
||||||
snowflake.beginWebRTC(!COPY_PASTE_ENABLED)
|
snowflake.beginWebRTC()
|
||||||
|
|
||||||
window.onload = init if window
|
window.onload = init if window
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
Only websocket-specific stuff.
|
Only websocket-specific stuff.
|
||||||
###
|
###
|
||||||
|
|
||||||
|
DEFAULT_PORTS =
|
||||||
|
http: 80
|
||||||
|
https: 443
|
||||||
|
|
||||||
# Build an escaped URL string from unescaped components. Only scheme and host
|
# Build an escaped URL string from unescaped components. Only scheme and host
|
||||||
# are required. See RFC 3986, section 3.
|
# are required. See RFC 3986, section 3.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue