dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make bridge allocation shuffle randomly to distribute load 

inspired by this work: https://trac.torproject.org/projects/tor/ticket/18113
we don't want all users to start with the same bridges in the same order
This commit is contained in:
Nathan Freitas 2016-01-25 15:45:36 -05:00
parent ba835599f7
commit 1dbe5eac55
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/torproject/android/OrbotMainActivity.java
View File

@ -10,7 +10,9 @@ import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Locale; import java.util.Locale;
import java.util.Random;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.json.JSONArray; import org.json.JSONArray;
@ -1384,7 +1386,7 @@ public class OrbotMainActivity extends AppCompatActivity
while(st.hasMoreTokens()) while(st.hasMoreTokens())
sbConfig.append(st.nextToken()).append(' '); sbConfig.append(st.nextToken()).append(' ');
b.config = sbConfig.toString(); b.config = sbConfig.toString().trim();
alBridges.add(b); alBridges.add(b);
@ -1404,6 +1406,11 @@ public class OrbotMainActivity extends AppCompatActivity
{ {
StringBuffer sbConfig = new StringBuffer (); StringBuffer sbConfig = new StringBuffer ();
//we should randomly sort alBridges so we don't have the same bridge order each time
long seed = System.nanoTime();
Collections.shuffle(alBridges, new Random(seed));
//now go through the list to find the bridges we want
for (Bridge b : alBridges) for (Bridge b : alBridges)
{ {
if (b.type.equals(type)) if (b.type.equals(type))