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

Remove property "running" from proxy-pair

Browse source 
We don't need it, and already have a function webrtcIsReady that tells
us what we need to know (whether a datachannel was opened before the
timeout period).
This commit is contained in:
Cecylia Bocovich 2019-10-18 16:58:54 -04:00
parent 9b470fbe4b
commit d186fcd401
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
proxy/proxypair.js
View file

@ -88,7 +88,6 @@ class ProxyPair {
if (!this.active) { if (!this.active) {
return; return;
} }
this.running = true;
snowflake.ui.setActive(true); snowflake.ui.setActive(true);
// This is the point when the WebRTC datachannel is done, so the next step // This is the point when the WebRTC datachannel is done, so the next step
// is to establish websocket to the server. // is to establish websocket to the server.
@ -191,7 +190,6 @@ class ProxyPair {
this.relay = null; this.relay = null;
this.onCleanup(); this.onCleanup();
this.active = false; this.active = false;
this.running = false;
} }
flush() { flush() {
@ -255,8 +253,6 @@ ProxyPair.prototype.relay = null; // websocket
ProxyPair.prototype.timer = 0; ProxyPair.prototype.timer = 0;
ProxyPair.prototype.running = false; // Whether a datachannel is opened
ProxyPair.prototype.active = false; // Whether serving a client. ProxyPair.prototype.active = false; // Whether serving a client.
ProxyPair.prototype.flush_timeout_id = null; ProxyPair.prototype.flush_timeout_id = null;

2
proxy/snowflake.js
View file

@ -78,7 +78,7 @@ class Snowflake {
} }
//set a timeout for channel creation //set a timeout for channel creation
return setTimeout((() => { return setTimeout((() => {
if (!pair.running) { if (!pair.webrtcIsReady()) {
log('proxypair datachannel timed out waiting for open'); log('proxypair datachannel timed out waiting for open');
pair.close(); pair.close();
return pair.active = false; return pair.active = false;