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 "active" property of proxyPairs

Browse source 
Use their existence in the proxy pair list to indicate they are active.
This commit is contained in:
Cecylia Bocovich 2019-10-18 17:28:53 -04:00
parent d186fcd401
commit 789285e0df
2 changed files with 25 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

58
proxy/snowflake.js
View file

@ -43,10 +43,6 @@ class Snowflake {
// Initialize WebRTC PeerConnection, which requires beginning the signalling
// process. |pollBroker| automatically arranges signalling.
beginWebRTC() {
log('ProxyPair Slots: ' + this.proxyPairs.length);
log('Snowflake IDs: ' + (this.proxyPairs.map(function(p) {
return p.id;
})).join(' | '));
this.pollBroker();
return this.pollInterval = setInterval((() => {
return this.pollBroker();
@ -58,13 +54,13 @@ class Snowflake {
pollBroker() {
var msg, pair, recv;
// Poll broker for clients.
pair = this.nextAvailableProxyPair();
pair = this.makeProxyPair();
if (!pair) {
log('At client capacity.');
return;
}
log('Polling broker..');
// Do nothing until a new proxyPair is available.
pair.active = true;
msg = 'Polling for client ... ';
if (this.retries > 0) {
msg += '[retries: ' + this.retries + ']';
@ -72,35 +68,23 @@ class Snowflake {
this.ui.setStatus(msg);
recv = this.broker.getClientOffer(pair.id);
recv.then((desc) => {
if (pair.active) {
if (!this.receiveOffer(pair, desc)) {
return pair.active = false;
}
//set a timeout for channel creation
return setTimeout((() => {
if (!pair.webrtcIsReady()) {
log('proxypair datachannel timed out waiting for open');
pair.close();
return pair.active = false;
}
}), 20000); // 20 second timeout
if (!this.receiveOffer(pair, desc)) {
return pair.close();
}
//set a timeout for channel creation
return setTimeout((() => {
if (!pair.webrtcIsReady()) {
log('proxypair datachannel timed out waiting for open');
return pair.close();
}
}), 20000); // 20 second timeout
}, function() {
return pair.active = false;
//on error, close proxy pair
return pair.close();
});
return this.retries++;
}
// Returns the first ProxyPair that's available to connect.
nextAvailableProxyPair() {
if (this.proxyPairs.length < this.config.connectionsPerClient) {
return this.makeProxyPair(this.relayAddr);
}
return this.proxyPairs.find(function(pp) {
return !pp.active;
});
}
receiveOffer(pair, desc) {
var e, offer, sdp;
try {
@ -127,19 +111,27 @@ class Snowflake {
return pair.pc.setLocalDescription(sdp).catch(fail);
};
fail = function() {
pair.active = false
pair.close();
return dbg('webrtc: Failed to create or set Answer');
};
return pair.pc.createAnswer().then(next).catch(fail);
}
makeProxyPair(relay) {
makeProxyPair() {
if (this.proxyPairs.length >= this.config.connectionsPerClient) {
return null;
}
var pair;
pair = new ProxyPair(relay, this.rateLimit, this.config.pcConfig);
pair = new ProxyPair(this.relayAddr, this.rateLimit, this.config.pcConfig);
this.proxyPairs.push(pair);
log('Snowflake IDs: ' + (this.proxyPairs.map(function(p) {
return p.id;
})).join(' | '));
pair.onCleanup = () => {
var ind;
// Delete from the list of active proxy pairs.
// Delete from the list of proxy pairs.
ind = this.proxyPairs.indexOf(pair);
if (ind > -1) {
return this.proxyPairs.splice(ind, 1);