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

[ooni-probe/master] Avoid that scapy's log function overrides the import of ooni.log
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 104fd67545d559286d4823ccfd14be41378c6b4c Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 15:20:47 2012 +0100 Avoid that scapy's log function overrides the import of ooni.log --- nettests/core/traceroute.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/nettests/core/traceroute.py b/nettests/core/traceroute.py index bbbe14e..a6fc9f1 100644 --- a/nettests/core/traceroute.py +++ b/nettests/core/traceroute.py @@ -6,11 +6,12 @@ from twisted.python import usage from twisted.internet import defer -from ooni.utils import log from ooni.templates import scapyt from scapy.all import * +from ooni.utils import log + class UsageOptions(usage.Options): optParameters = [ ['backend', 'b', '8.8.8.8', 'Test backend to use'], @@ -48,6 +49,7 @@ class TracerouteTest(scapyt.BaseScapyTest): self.report['timeout'] = timeout return max_ttl, timeout + def test_tcp_traceroute(self): """ Does a traceroute to the destination by sending TCP SYN packets

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit ccf45d0b2406d5f4bc50190a84b165743d4e671e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 12:45:22 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ee9f682..a7424d2 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-22 00:40+0000\n" +"PO-Revision-Date: 2012-11-22 12:28+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3447,7 +3447,7 @@ msgstr "¡El puerto de repetidor (relay) de su servidor es accesible desde la re msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "¡Fallo en la prueba de acceso al puerto de su servidor!" +msgstr "Fallo en la prueba de acceso al puerto de su servidor" msgctxt "StatusEventWidget" msgid "" @@ -3470,15 +3470,15 @@ msgstr "Tor está tratando de determinar si el puerto de su lista de propagació msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "¡Prueba de acceso al puerto de la lista de propagación (directory) realizada con exito!" +msgstr "¡Prueba de acceso al puerto de la lista de propagación (directory) realizada con éxito!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "Puerto de su servidor de directorio es accesible desde la red Tor!" +msgstr "¡El puerto de la lista de propagación de repetidores (relay's directory) es accesible desde la red Tor!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "Prueba de acceso al puerto del Servidor de Directorio ha fallado!" +msgstr "Fallo en la prueba de acceso al puerto de la lista de propagación (directory)" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit 261a94581b9abda5c1ce10ef6dd1597cba79a4cb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 12:45:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ee9f682..a7424d2 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-22 00:40+0000\n" +"PO-Revision-Date: 2012-11-22 12:28+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3447,7 +3447,7 @@ msgstr "¡El puerto de repetidor (relay) de su servidor es accesible desde la re msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "¡Fallo en la prueba de acceso al puerto de su servidor!" +msgstr "Fallo en la prueba de acceso al puerto de su servidor" msgctxt "StatusEventWidget" msgid "" @@ -3470,15 +3470,15 @@ msgstr "Tor está tratando de determinar si el puerto de su lista de propagació msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "¡Prueba de acceso al puerto de la lista de propagación (directory) realizada con exito!" +msgstr "¡Prueba de acceso al puerto de la lista de propagación (directory) realizada con éxito!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "Puerto de su servidor de directorio es accesible desde la red Tor!" +msgstr "¡El puerto de la lista de propagación de repetidores (relay's directory) es accesible desde la red Tor!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "Prueba de acceso al puerto del Servidor de Directorio ha fallado!" +msgstr "Fallo en la prueba de acceso al puerto de la lista de propagación (directory)" msgctxt "StatusEventWidget" msgid ""

1 0

[ooni-probe/master] Rename Tor to control_agent
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 3dc58e0467a1be86208fffd08097652c6fe46f94 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 13:37:49 2012 +0100 Rename Tor to control_agent --- ooni/templates/httpt.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 47fbeb7..9bf41e8 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -161,9 +161,9 @@ class HTTPTest(NetTestCase): # We prefix the URL with 's' to make the connection go over the # configured socks proxy if use_tor: - log.debug("Using tor for the request") + log.debug("Using control agent for the request") url = 's'+url - agent = self.tor_agent + agent = self.control_agent else: agent = self.agent

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit 4706b3e0216e0f99dc86d1def8c0da76e901f74c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 12:16:01 2012 +0000 Update translations for tails-greeter --- lv/lv.po | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 0 deletions(-) diff --git a/lv/lv.po b/lv/lv.po new file mode 100644 index 0000000..53f021e --- /dev/null +++ b/lv/lv.po @@ -0,0 +1,136 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-06-01 15:10+0200\n" +"PO-Revision-Date: 2012-10-03 17:36+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lv\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr "" + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "" + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "" + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "<i>Passwords do not match</i>" +msgstr "" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "<i>Wrong passphrase. Please try again.</i>" +msgstr "" + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr ""

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit 62c51748bee57f282d6d274ff39843f501a40ec7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 12:15:57 2012 +0000 Update translations for tails-persistence-setup --- lv/lv.po | 318 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 318 insertions(+), 0 deletions(-) diff --git a/lv/lv.po b/lv/lv.po new file mode 100644 index 0000000..643d7b4 --- /dev/null +++ b/lv/lv.po @@ -0,0 +1,318 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-10-29 19:33+0100\n" +"PO-Revision-Date: 2012-10-03 17:39+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lv\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "APT Packages" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Packages downloaded by APT" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Lists" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Lists downloaded by APT" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "Dotfiles" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the <b>%s %s</b> device. Data on " +"this device will be stored in an encrypted form protected by a passphrase." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"<b>Beware!</b> Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:189 +msgid "Failed" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" <b>%s %s</b> device." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +msgid "Saving persistence configuration..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the <b>%s %s</b> device, will be deleted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr ""

1 0

[ooni-probe/master] Make the extra flags use the defaults of scapy
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 5e8edc54e84143681921cab217e8de12937ca611 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:41:04 2012 +0100 Make the extra flags use the defaults of scapy --- ooni/templates/scapyt.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index ca6d938..ff05922 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -44,24 +44,28 @@ class BaseScapyTest(NetTestCase): requiresRoot = True baseFlags = [ - ['ipsrc', 's', 'Check if IP src matches when processing answers'], + ['ipsrc', 's', 'Does *not* check if IP src and ICMP IP citation matches when processing answers'], ['seqack', 'k', 'Check if TCP sequence number and ack matches when processing answers'], ['ipid', 'i', 'Check if IP id matches when processing answers'] ] def _setUp(self): + self.report['answer_flags'] = [] if self.localOptions['ipsrc']: - config.checkIPsrc = 1 - else: config.checkIPsrc = 0 + else: + self.report['answer_flags'].append('ipsrc') + config.checkIPsrc = 1 if self.localOptions['ipid']: + self.report['answer_flags'].append('ipid') config.checkIPID = 1 else: config.checkIPID = 0 # XXX we don't support strict matching if self.localOptions['seqack']: + self.report['answer_flags'].append('seqack') config.check_TCPerror_seqack = 1 else: config.check_TCPerror_seqack = 0

1 0

[ooni-probe/master] Clean up docstrings of scapy test template
by art＠torproject.org 22 Nov '12

22 Nov '12

commit b505b1ca9891b5a9049234156ec570fc8847f093 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:56:56 2012 +0100 Clean up docstrings of scapy test template --- ooni/templates/scapyt.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index ff05922..8d9ea8f 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -45,8 +45,8 @@ class BaseScapyTest(NetTestCase): requiresRoot = True baseFlags = [ ['ipsrc', 's', 'Does *not* check if IP src and ICMP IP citation matches when processing answers'], - ['seqack', 'k', 'Check if TCP sequence number and ack matches when processing answers'], - ['ipid', 'i', 'Check if IP id matches when processing answers'] + ['seqack', 'k', 'Check if TCP sequence number and ACK match in the ICMP citation when processing answers'], + ['ipid', 'i', 'Check if the IPID matches when processing answers'] ] def _setUp(self): @@ -63,6 +63,10 @@ class BaseScapyTest(NetTestCase): else: config.checkIPID = 0 # XXX we don't support strict matching + # since (from scapy's documentation), some stacks have a bug for which + # the bytes in the IPID are swapped. + # Perhaps in the future we will want to have more fine grained control + # over this. if self.localOptions['seqack']: self.report['answer_flags'].append('seqack')

1 0

[ooni-probe/master] Add some more fine grained control over traceroute test
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 201a39b3a6c64a8f16e4a58d70bfbc3a22d5b969 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 12:11:07 2012 +0100 Add some more fine grained control over traceroute test * Configuration flags and options for source and destination ports --- nettests/core/traceroute.py | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/nettests/core/traceroute.py b/nettests/core/traceroute.py index 4317a0e..bbbe14e 100644 --- a/nettests/core/traceroute.py +++ b/nettests/core/traceroute.py @@ -15,8 +15,10 @@ class UsageOptions(usage.Options): optParameters = [ ['backend', 'b', '8.8.8.8', 'Test backend to use'], ['timeout', 't', 5, 'The timeout for the traceroute test'], - ['maxttl', 'm', 30, 'The maximum value of ttl to set on packets'] + ['maxttl', 'm', 30, 'The maximum value of ttl to set on packets'], + ['srcport', 'p', None, 'Set the source port to a specific value (only applies to TCP and UDP)'] ] + optFlags = [['randomize','r', 'Randomize the source port']] class TracerouteTest(scapyt.BaseScapyTest): name = "Multi Protocol Traceroute Test" @@ -24,8 +26,21 @@ class TracerouteTest(scapyt.BaseScapyTest): version = "0.1.1" usageOptions = UsageOptions + dst_ports = [22, 23, 53, 80, 123, 443] + + def setUp(self): + def get_sport(protocol): + if self.localOptions['srcport']: + return int(self.localOptions['srcport']) + elif self.localOptions['randomize']: + return random.randint(1024, 65535) + elif protocol == 'tcp': + return 80 + elif protocol == 'udp': + return 53 + + self.get_sport = get_sport - dst_ports = [22, 23, 80, 123, 443] def max_ttl_and_timeout(self): max_ttl = int(self.localOptions['maxttl']) timeout = int(self.localOptions['timeout']) @@ -53,8 +68,10 @@ class TracerouteTest(scapyt.BaseScapyTest): dl = [] max_ttl, timeout = self.max_ttl_and_timeout() for port in self.dst_ports: - packets = IP(dst=self.localOptions['backend'], - ttl=(1,max_ttl),id=RandShort())/TCP(flags=0x2, dport=port) + packets = IP(dst=self.localOptions['backend'], + ttl=(1,max_ttl),id=RandShort())/TCP(flags=0x2, dport=port, + sport=self.get_sport('tcp')) + d = self.sr(packets, timeout=timeout) d.addCallback(finished, port) dl.append(d) @@ -80,7 +97,9 @@ class TracerouteTest(scapyt.BaseScapyTest): max_ttl, timeout = self.max_ttl_and_timeout() for port in self.dst_ports: packets = IP(dst=self.localOptions['backend'], - ttl=(1,max_ttl),id=RandShort())/UDP(dport=port) + ttl=(1,max_ttl),id=RandShort())/UDP(dport=port, + sport=self.get_sport('udp')) + d = self.sr(packets, timeout=timeout) d.addCallback(finished, port) dl.append(d) @@ -106,6 +125,7 @@ class TracerouteTest(scapyt.BaseScapyTest): max_ttl, timeout = self.max_ttl_and_timeout() packets = IP(dst=self.localOptions['backend'], ttl=(1,max_ttl),id=RandShort())/ICMP() + d = self.sr(packets, timeout=timeout) d.addCallback(finished) return d

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit 47e10215c8541b2cd08c26756272e5c092f69704 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 10:45:39 2012 +0000 Update translations for vidalia_help_completed --- ro/links.po | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/ro/links.po b/ro/links.po new file mode 100644 index 0000000..da53fc9 --- /dev/null +++ b/ro/links.po @@ -0,0 +1,81 @@ +# +# Translators: +# <anouser(a)yahoo.com>, 2012. +# <roastmepls(a)yahoo.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-05-05 20:21+0200\n" +"PO-Revision-Date: 2012-11-22 10:21+0000\n" +"Last-Translator: HarmlessKiller <roastmepls(a)yahoo.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#. type: Content of: <html><body><h1> +#: links.html:16 +msgid "Helpful Links" +msgstr "Adrese utile" + +#. type: Content of: <html><body><h3> +#: links.html:19 +msgid "Vidalia" +msgstr "Vidalia" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 +msgid "   " +msgstr "   " + +#. type: Content of: <html><body><table><tr><td> +#: links.html:23 links.html:43 +msgid "Homepage" +msgstr "Prima pagina" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:25 +msgid "" +"<a href=\"https://www.torproject.org/vidalia/\"> " +"https://www.torproject.org/vidalia/</a>" +msgstr "<a href=\"https://www.torproject.org/vidalia/\"> https://www.torproject.org/vidalia/</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:31 links.html:58 +msgid "Wiki and Bugtracker" +msgstr "Wiki si Bugtracker" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:33 +msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" + +#. type: Content of: <html><body><h3> +#: links.html:39 +msgid "Tor" +msgstr "Tor" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:45 +msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" +msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:50 +msgid "FAQ" +msgstr "FAQ" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:52 +msgid "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" +msgstr "<a href=\"https://www.torproject.org/docs/faq.html\"> https://www.torproject.org/docs/faq.html</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:60 +msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" +msgstr "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"

1 0