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

Fix to check running status before closing proxy

Browse source 
This fixes a bug reported in #31385. There was an error with the proxy
deadlock fix in #31100 where we close proxies regardless of connection
status.
This commit is contained in:
Cecylia Bocovich 2019-08-23 15:45:18 -04:00
parent 6be7bedd06
commit 8a5941daab
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
proxy/snowflake.js
View file

@ -78,11 +78,13 @@ class Snowflake {
if (!this.receiveOffer(pair, desc)) { if (!this.receiveOffer(pair, desc)) {
return pair.active = false; return pair.active = false;
} }
//set a timeout for channel creation //set a timeout for channel creation
return setTimeout((() => { return setTimeout((() => {
log('proxypair datachannel timed out waiting for open'); if (!pair.running) {
pair.close(); log('proxypair datachannel timed out waiting for open');
return pair.active = false; pair.close();
return pair.active = false;
}
}), 20000); // 20 second timeout }), 20000); // 20 second timeout
} else { } else {
return pair.active = false; return pair.active = false;