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

Stop resetting after every pair closes

Browse source
This commit is contained in:
Arlo Breault 2019-06-29 18:09:12 -04:00 • committed by Cecylia Bocovich
parent 58d07788c7
commit b1116a1c35
4 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
proxy/init-badge.coffee
View file

@ -54,7 +54,7 @@ window.onbeforeunload = ->
null null
window.onunload = -> window.onunload = ->
pair.close() for pair in snowflake.proxyPairs snowflake.disable()
null null
window.onload = init window.onload = init

2
proxy/init-webext.coffee
View file

@ -45,7 +45,7 @@ window.onbeforeunload = ->
null null
window.onunload = -> window.onunload = ->
pair.close() for pair in snowflake.proxyPairs snowflake.disable()
null null
window.onload = init window.onload = init

3
proxy/proxypair.coffee
View file

@ -78,8 +78,6 @@ class ProxyPair
snowflake.state = Snowflake.MODE.INIT snowflake.state = Snowflake.MODE.INIT
@flush() @flush()
@close() @close()
# TODO: Change this for multiplexing.
snowflake.reset()
channel.onerror = -> log 'Data channel error!' channel.onerror = -> log 'Data channel error!'
channel.binaryType = "arraybuffer" channel.binaryType = "arraybuffer"
channel.onmessage = @onClientToRelayMessage channel.onmessage = @onClientToRelayMessage
@ -149,6 +147,7 @@ class ProxyPair
@client.close() if @webrtcIsReady() @client.close() if @webrtcIsReady()
@relay.close() if @relayIsReady() @relay.close() if @relayIsReady()
relay = null relay = null
@onCleanup()
# Send as much data in both directions as the rate limit currently allows. # Send as much data in both directions as the rate limit currently allows.
flush: => flush: =>

29
proxy/snowflake.coffee
View file

@ -51,8 +51,6 @@ class Snowflake
# process. |pollBroker| automatically arranges signalling. # process. |pollBroker| automatically arranges signalling.
beginWebRTC: -> beginWebRTC: ->
@state = Snowflake.MODE.WEBRTC_CONNECTING @state = Snowflake.MODE.WEBRTC_CONNECTING
for i in [1..@config.connectionsPerClient]
@makeProxyPair @relayAddr
log 'ProxyPair Slots: ' + @proxyPairs.length log 'ProxyPair Slots: ' + @proxyPairs.length
log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | ' log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | '
@pollBroker() @pollBroker()
@ -82,6 +80,8 @@ class Snowflake
# Returns the first ProxyPair that's available to connect. # Returns the first ProxyPair that's available to connect.
nextAvailableProxyPair: -> nextAvailableProxyPair: ->
if @proxyPairs.length < @config.connectionsPerClient
return @makeProxyPair @relayAddr
return @proxyPairs.find (pp, i, arr) -> return !pp.active return @proxyPairs.find (pp, i, arr) -> return !pp.active
# Receive an SDP offer from some client assigned by the Broker, # Receive an SDP offer from some client assigned by the Broker,
@ -110,27 +110,14 @@ class Snowflake
@proxyPairs.push pair @proxyPairs.push pair
pair.onCleanup = (event) => pair.onCleanup = (event) =>
# Delete from the list of active proxy pairs. # Delete from the list of active proxy pairs.
@proxyPairs.splice(@proxyPairs.indexOf(pair), 1) ind = @proxyPairs.indexOf(pair)
@pollBroker() if ind > -1 then @proxyPairs.splice(ind, 1)
pair.begin() pair.begin()
return pair
# Stop all proxypairs. # Stop all proxypairs.
cease: ->
while @proxyPairs.length > 0
@proxyPairs.pop().close()
clearInterval(@pollInterval)
disable: -> disable: ->
log 'Disabling Snowflake.' log 'Disabling Snowflake.'
@cease() clearInterval(@pollInterval)
while @proxyPairs.length > 0
die: -> @proxyPairs.pop().close()
log 'Snowflake died.'
@cease()
# Close all existing ProxyPairs and begin finding new clients from scratch.
reset: ->
@cease()
log 'Snowflake resetting...'
@retries = 0
@beginWebRTC()