December 2012 - tor-commits - lists.torproject.org

[flashproxy/master] Add GNU/Linux bundle instructions.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 33f9cf2e358b3aa34a5a56298df2786e9447b53c Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 12:24:23 2012 -0800 Add GNU/Linux bundle instructions. --- doc/bundle-gnulinux.txt | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 0 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt new file mode 100644 index 0000000..93bdb30 --- /dev/null +++ b/doc/bundle-gnulinux.txt @@ -0,0 +1,129 @@ +== Creating a Debian VM + +Set up Debian VMs for building bundles. You need one for i386 and one +for amd64. + +http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-cd/debian-6.0.6-i386-netinst.iso +http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-cd/SHA256SUMS +http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-cd/SHA256SUMS.sign + +http://cdimage.debian.org/debian-cd/6.0.6/amd64/iso-cd/debian-6.0.6-amd64-netinst.iso +http://cdimage.debian.org/debian-cd/6.0.6/amd64/iso-cd/SHA256SUMS +http://cdimage.debian.org/debian-cd/6.0.6/amd64/iso-cd/SHA256SUMS.sign + +Verify the digests. + http://www.debian.org/CD/verify +If you are using Debian, you can get the signing key by installing the +debian-keyring package (apt-get install debian-keyring). Add + --keyring /usr/share/keyrings/debian-role-keys.gpg +to the gpg --verify command. + + $ gpg --verify SHA256SUMS.sign SHA256SUMS + + $ sha256sum debian-6.0.6-i386-netinst.iso + 2b4bcd9e782dfd6a5af9cac3e981be375652b2e5579402405eaf84ac4fe3754f debian-6.0.6-i386-netinst.iso + $ grep netinst SHA256SUMS + 2b4bcd9e782dfd6a5af9cac3e981be375652b2e5579402405eaf84ac4fe3754f debian-6.0.6-i386-netinst.iso + + $ sha256sum debian-6.0.6-amd64-netinst.iso + 41d74134bf967b65d0b61a314ee07dfb539e03502ca69d9d3be8ab3b01da02d2 debian-6.0.6-amd64-netinst.iso + $ grep netinst SHA256SUMS + 41d74134bf967b65d0b61a314ee07dfb539e03502ca69d9d3be8ab3b01da02d2 debian-6.0.6-amd64-netinst.iso + +Create the disk images. + + $ qemu-img create -f qcow2 debian-6-i386-bundle.hda 10G + $ qemu-img create -f qcow2 debian-6-amd64-bundle.hda 10G + +Then boot the VM. You need your normal user to be in the "kvm" group for +this to work (sudo usermod -a -G kvm user). + + $ kvm -hda debian-6-i386-bundle.hda -cdrom debian-6.0.6-i386-netinst.iso + $ kvm -hda debian-6-x86_64-bundle.hda -cdrom debian-6.0.6-i386-netinst.iso + +Choose "Install" when it boots. Here are settings: + + English + United States + American English + Hostname: debian + Domain name: + Root password: + User full name: bundle + User name: bundle + User password: password + Any time zone + Guided - use entire disk + All files in one partition + Any mirror + popularity-contest: no + Software select: uncheck all but "Standard system utilities" + GRUB on MBR: yes + +Packages to install: + + sudo apt-get update + sudo apt-get upgrade + sudo apt-get install git make python-m2crypto zip + +== Browser bundle + +Clone and build the flashproxy source. + + $ git clone https://git.torproject.org/flashproxy.git + $ cd flashproxy + $ make dist + +Within the VM, download the 32-bit or 64-bit obfsproxy bundle from +https://www.torproject.org/projects/obfsproxy. The instructions below +are for the 32-bit (i686) version. + +https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-2.4.6-alpha-2-dev-en-US.tar.gz +https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-2.4.6-alpha-2-dev-en-US.tar.gz.asc + +https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-2.4.6-alpha-2-dev-en-US.tar.gz +https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-2.4.6-alpha-2-dev-en-US.tar.gz.asc + +Extract the bundle. + + $ gpg --verify tor-obfsproxy-browser-gnu-linux-i686-2.4.6-alpha-2-dev-en-US.tar.gz.asc + $ tar xzvf tor-obfsproxy-browser-gnu-linux-i686-2.4.6-alpha-2-dev-en-US.tar.gz.asc + $ cd tor-browser_en-US + +Copy files into the bundle. + + $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} App + $ cp -r /usr/lib/pymodules/python2.6/M2Crypto App + $ mkdir -p Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE} Docs/FlashProxy + +Make the second half of Data/Tor/torrc look like this (i.e., keep +the generic configuration, but change the obfsproxy-specific stuff). +Basically you are concatenating the normal flashproxy-client torrc, but +changing "./flashproxy-client" to "./App/flashproxy-client". + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000 + +Re-zip the bundle. The "alpha" number should be independent of the +obfsproxy bundle's alpha. + + $ cd .. + $ tar czvf tor-flashproxy-browser-gnu-linux-i686-2.4.6-alpha-1-dev-en-US.tar.gz tor-browser_en-US + +Test running the bundle. Extract into a separate directory, double-click +the icon to unzip, and run TorBrowser_en-US.app. + + $ mkdir tmp + $ cp tor-flashproxy-browser-gnu-linux-i686-2.4.6-alpha-1-dev-en-US.tar.gz tmp + $ cd tmp + $ tar xzvf tor-flashproxy-browser-gnu-linux-i686-2.4.6-alpha-1-dev-en-US.tar.gz + $ cd tor-browser_en-US + $ ./start-tor-browser

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 12 Dec '12

12 Dec '12

commit aacda8dd11fef26953b06ae21b2f64d109d90752 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 12 17:16:07 2012 +0000 Update translations for liveusb-creator_completed --- eu/eu.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/eu.po b/eu/eu.po index 3d384c3..4b9ea33 100644 --- a/eu/eu.po +++ b/eu/eu.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-12-01 09:32+0000\n" +"PO-Revision-Date: 2012-12-12 16:49+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgstr "Abisua: Tresna hau Administratzaile bezala exekutatu behar da. Hau egite #: ../liveusb/gui.py:413 msgid "Unable to find any USB drive" -msgstr "Ezin da USB gailurik bilatu." +msgstr "Ezin da USB gailurik aurkitu." #: ../liveusb/gui.py:521 msgid "" @@ -340,7 +340,7 @@ msgstr "%s dagoeneko abiarazgarria da" #: ../liveusb/creator.py:1037 msgid "Unable to find partition" -msgstr "Ezin da partizioa bilatu" +msgstr "Ezin da partizioa aurkitu" #: ../liveusb/creator.py:1060 #, python-format @@ -397,7 +397,7 @@ msgstr "Ezin da Win32_LogicalDisk lortu; win32com eskaerak ez du erantzunik itzu #: ../liveusb/creator.py:1330 msgid "Cannot find" -msgstr "Ezin da bilatu" +msgstr "Ezin da aurkitu" #: ../liveusb/creator.py:1331 msgid ""

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 12 Dec '12

12 Dec '12

commit e01f7366d48665a77cc06ccd505bfbccc3126ffb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 12 17:16:04 2012 +0000 Update translations for liveusb-creator --- eu/eu.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/eu.po b/eu/eu.po index 3d384c3..4b9ea33 100644 --- a/eu/eu.po +++ b/eu/eu.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-12-01 09:32+0000\n" +"PO-Revision-Date: 2012-12-12 16:49+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgstr "Abisua: Tresna hau Administratzaile bezala exekutatu behar da. Hau egite #: ../liveusb/gui.py:413 msgid "Unable to find any USB drive" -msgstr "Ezin da USB gailurik bilatu." +msgstr "Ezin da USB gailurik aurkitu." #: ../liveusb/gui.py:521 msgid "" @@ -340,7 +340,7 @@ msgstr "%s dagoeneko abiarazgarria da" #: ../liveusb/creator.py:1037 msgid "Unable to find partition" -msgstr "Ezin da partizioa bilatu" +msgstr "Ezin da partizioa aurkitu" #: ../liveusb/creator.py:1060 #, python-format @@ -397,7 +397,7 @@ msgstr "Ezin da Win32_LogicalDisk lortu; win32com eskaerak ez du erantzunik itzu #: ../liveusb/creator.py:1330 msgid "Cannot find" -msgstr "Ezin da bilatu" +msgstr "Ezin da aurkitu" #: ../liveusb/creator.py:1331 msgid ""

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 12 Dec '12

12 Dec '12

commit 354821049b8f25f5866711d983d95239adc02b41 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 12 17:15:33 2012 +0000 Update translations for vidalia_help --- eu/troubleshooting.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/troubleshooting.po b/eu/troubleshooting.po index ab95076..4245bd8 100644 --- a/eu/troubleshooting.po +++ b/eu/troubleshooting.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-12-12 16:43+0000\n" +"PO-Revision-Date: 2012-12-12 16:54+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -197,7 +197,7 @@ msgid "" " Tor process already running. Check the <a href=\"log.html\">message log</a>" " to see if any of the last few messages in the list are highlighted in " "yellow and contain a message similar to the following:" -msgstr "" +msgstr "Tor abiarazten saiatzerakoan berehala irtetzen bada, ziurrenik dagoeneko beste Tor prozesu bat exekutatzen izango duzu. Begiratu <a href=\"log.html\">mezu erregistroa</a> ea zerrendako azkenengo mezuek horiz nabarmenduta dauden eta hurrengoaren antzeko mezurik duten:" # type: Content of: <html><body><pre> #: en/troubleshooting.html:131 @@ -215,7 +215,7 @@ msgid "" "would need to look for tor.exe in your Task Manager. On most other " "operating systems, the ps command can help you find the other Tor " "process." -msgstr "" +msgstr "Goikoa bezalako akats mezuren bat aurkitzen baduzu, Toren beste prozesua gelditu beharko duzu Vidaliarekin berri bat abiarazi baino lehen. Windowsen, tor.exe bilatu beharko duzu zure Ataza kudeatzailean. Beste sistema eragile gehienetan, ps komandoak Toren beste prozesua bilatzen lagun zaitzake." # type: Content of: <html><body> #: en/troubleshooting.html:141

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 12 Dec '12

12 Dec '12

commit 23394d51235ed42661f30cd59b17f238fe3a81c4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 12 16:45:31 2012 +0000 Update translations for vidalia_help --- eu/troubleshooting.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eu/troubleshooting.po b/eu/troubleshooting.po index 3044e1e..ab95076 100644 --- a/eu/troubleshooting.po +++ b/eu/troubleshooting.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-12-02 10:12+0000\n" +"PO-Revision-Date: 2012-12-12 16:43+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -224,7 +224,7 @@ msgid "" "seconds), then you should check the <a href=\"log.html\">message log</a> for" " information about any errors Tor experienced before it exited. Such errors " "will be highlighted in either red or yellow." -msgstr "" +msgstr "Tor denbora batean ongi exekutatzen egon bada (hau da, segundu gutxi batzuk baino gehiago), orduan <a href=\"log.html\">mezu erregistroa</a> begiratu beharko zenuke Torek irten baino lehenago izan dituen akatsei buruzko informazioa lortzeko. Horrelako akatsak gorriz edo horiz nabarmenduta egongo dira." # type: Content of: <html><body> #: en/troubleshooting.html:147

1 0

[flashproxy/master] Add instructions for making a Mac bundle.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit aa0cb4b62c1ecb3f0e14f5a10a2000560db2ddba Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:34:44 2012 -0800 Add instructions for making a Mac bundle. --- doc/bundle-macosx.txt | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt new file mode 100644 index 0000000..fc47b51 --- /dev/null +++ b/doc/bundle-macosx.txt @@ -0,0 +1,91 @@ +This document describes how to build a Tor Browser bundle for Mac OS X +that is preconfigured to use the flash proxy transport. Because Mac have +Python preinstalled, we include the Python source of the programs. An +exception to this is the M2Crypto library, which has some compiled +components. + +== Dependencies + +=== SWIG + +This is a prerequisite for building M2Crypto. + +http://www.swig.org/download.html +http://downloads.sourceforge.net/project/swig/swig/swig-2.0.8/swig-2.0.8.tar.gz + +The sha256sum (shasum -a 256) of the package I used was + +aeeefa20bbe1c03bacf23f0af9e7d6193e8b807b7585470615b71b1ee0c8ca4f swig-2.0.8.tar.gz + +SWIG requires PCRE, but is capable of building PCRE by itself if you +download the source first. Save the PCRE tarball inside the extracted +SWIG directory. + +http://www.pcre.org +http://downloads.sourceforge.net/project/pcre/pcre/8.32/pcre-8.32.tar.bz2 +http://downloads.sourceforge.net/project/pcre/pcre/8.32/pcre-8.32.tar.bz2.sig + + $ rm pcre-8.32.tar.bz2.sig # The next command won't run with this file present. + $ ./Tools/pcre-build.sh + $ ./configure --prefix=~/bundle/usr + $ make + $ make install + +=== M2Crypto + +http://chandlerproject.org/Projects/MeTooCrypto#Downloads +http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz +http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz.asc + +$ python setup.py build_ext --swig ~/bundle/usr/bin/swig +$ mkdir -p ~/usr/lib/python2.7/site-packages/ +$ python setup.py install --root ~/bundle --prefix=/usr + +== Browser bundle + +Download the 32-bit obfsproxy bundle from +https://www.torproject.org/projects/obfsproxy. + +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip.asc + +Extract the bundle. + + $ tar xzvf TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip + $ cd TorBrowser_en-US.app + +Copy files into the bundle. + + $ cp ~/flashproxy/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS + $ cp -R ~/bundle/usr/lib/python2.7/site-packages/M2Crypto Contents/MacOS + $ cp ~/flashproxy/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS + $ mkdir -p Contents/Resources/Docs/FlashProxy + $ cp ~/flashproxy/{doc/*,README,LICENSE} Contents/Resources/Docs/FlashProxy + +Make the second half of Data/Tor/torrc look like this (i.e., keep +the generic configuration, but change the obfsproxy-specific stuff). +Basically you are concatenating the normal flashproxy-client torrc, but +changing "./flashproxy-client" to "flashproxy-client". + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 + +Re-zip the bundle. The "alpha" number should be independent of the +obfsproxy bundle's alpha. + + $ cd .. + $ rm -f TorBrowser-FlashProxy-2.4.6-alpha-2-osx-i386-en-US.zip + $ zip -r -9 TorBrowser-FlashProxy-2.4.6-alpha-2-osx-i386-en-US.zip TorBrowser_en-US.app/ + +Test running the bundle. Extract into a separate directory, double-click +the icon to unzip, and run TorBrowser_en-US.app. + + $ mkdir tmp + $ cp TorBrowser-FlashProxy-2.4.6-alpha-2-osx-i386-en-US.zip tmp

1 0

[flashproxy/master] Dedent torrc snippet for easier copy-paste.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 551a01a46eaac25d9e314c605c9db9df6a8b8c9c Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:30:40 2012 -0800 Dedent torrc snippet for easier copy-paste. --- doc/windows-deployment-howto.txt | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index 8edb7bc..f3f8852 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -173,15 +173,15 @@ the generic configuration, but change the obfsproxy-specific stuff). Basically you are concatenating the normal flashproxy-client torrc, but changing "./flashproxy-client" to "flashproxy-client". - UseBridges 1 - # The address and port are ignored by the client transport plugin. - Bridge websocket 0.0.1.0:1 - LearnCircuitBuildTimeout 0 - CircuitBuildTimeout 60 - # Change the second number here (9000) to the number of a port that can - # receive connections from the Internet (the port for which you - # configured port forwarding). - ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 Re-zip the bundle. The "alpha" number should be independent of the obfsproxy bundle's alpha.

1 0

[flashproxy/master] Have a proxy open two connections to the client.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit b634d197fd7c2076d299850ca4e100116df59e21 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:12:30 2012 -0800 Have a proxy open two connections to the client. I hope this is a stopgap measure until we can figure out https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html. What's going wrong is that each time you register, you have some probability of success (close to 1). Requiring a second connection squares (lowers) this success probability, not to mention it's slower because flashproxy-reg-email can take up to a minute to serve you after you register. --- proxy/flashproxy.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index b18e9b5..a4b8f54 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -532,6 +532,10 @@ function FlashProxy() { }; this.begin_proxy = function(client_addr, relay_addr) { + /* Start two proxy connections because of some versions of Tor making + two pt connections: + https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html */ + this.make_proxy_pair(client_addr, relay_addr); this.make_proxy_pair(client_addr, relay_addr); };

1 0

[flashproxy/master] Factor out a begin_proxy function to wrap make_proxy_pair.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 2ccd84f9f079cd00aa523d7f5b4cb0e5211a5b26 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:06:27 2012 -0800 Factor out a begin_proxy function to wrap make_proxy_pair. --- proxy/flashproxy.js | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 13a77f5..b18e9b5 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -450,7 +450,7 @@ function FlashProxy() { return; } if (client_addr !== undefined && relay_addr !== undefined) { - this.make_proxy_pair(client_addr, relay_addr); + this.begin_proxy(client_addr, relay_addr); } else if (client_addr !== undefined) { puts("Error: the \"client\" parameter requires \"relay\" also.") this.die(); @@ -528,6 +528,10 @@ function FlashProxy() { puts("Facilitator: got client:" + repr(client_addr) + " " + "relay:" + repr(relay_addr) + "."); + this.begin_proxy(client_addr, relay_addr); + }; + + this.begin_proxy = function(client_addr, relay_addr) { this.make_proxy_pair(client_addr, relay_addr); };

1 0

[flashproxy/master] Hand out each client registration 5 times.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit fa79cd494d55221055cd795f76fe0cfc164b8f7a Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 02:46:10 2012 -0800 Hand out each client registration 5 times. This is not an implementation of #5426, in at least two ways: 1. The same proxy may get the same client twice (unlikely with current proxy volume). 2. The registration's count doesn't go down when one of its proxies disappears. Doing this is however a step towards #5426. --- facilitator/facilitator | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 26e449d..af2c04c 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -21,6 +21,8 @@ CLIENT_TIMEOUT = 1.0 # Buffer no more than this many bytes when trying to read a line. READLINE_MAX_LENGTH = 10240 +MAX_PROXIES_PER_CLIENT = 5 + LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): @@ -97,34 +99,41 @@ class Reg(object): class RegSet(object): def __init__(self): - self.set = [] + self.tiers = [[] for i in range(MAX_PROXIES_PER_CLIENT)] self.cv = threading.Condition() def add(self, reg): self.cv.acquire() try: - if reg not in list(self.set): - self.set.append(reg) + for tier in self.tiers: + if reg in tier: + break + else: + self.tiers[0].append(reg) self.cv.notify() return True - else: - return False + return False finally: self.cv.release() def fetch(self): self.cv.acquire() try: - if not self.set: - return None - return self.set.pop(0) + for i in range(len(self.tiers)): + tier = self.tiers[i] + if tier: + reg = tier.pop(0) + if i + 1 < len(self.tiers): + self.tiers[i+1].append(reg) + return reg + return None finally: self.cv.release() def __len__(self): self.cv.acquire() try: - return len(self.set) + return sum(len(tier) for tier in self.tiers) finally: self.cv.release()

1 0