- tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 18 Nov '11

18 Nov '11

commit 8ee1960a0fc301b3a3d5729065f3adcceefc86da Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 18 10:15:07 2011 +0000 Update translations for gettor --- fr/gettor.po | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fr/gettor.po b/fr/gettor.po index bb4ea67..43c6a93 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -8,13 +8,14 @@ # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. # mehditaileb <mehditaileb(a)liberte-info.net>, 2011. # Pierre Antoine <pierre.antoine(a)ieee.org>, 2011. +# <pouknouki(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2011-11-14 04:06+0000\n" -"Last-Translator: arpalord <arpalord(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-18 09:56+0000\n" +"Last-Translator: Pouknouki <pouknouki(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,6 +67,8 @@ msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" msgstr "" +"Si vous avez une question ou que ça ne fonctionne pas, vous pouvez contacter" +" quelqu'un à cette adresse e-mail de support : help(a)rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -614,5 +617,10 @@ msgid "" " https://tor.beme-it.de/dist/torbrowser/\n" " https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" msgstr "" +"Désolé, mais le paquetage que vous avez demandé (%s) est trop gros pour votre fournisseur d'adresse mail. Essayez d'obtenir le paquetage avec un fournisseur qui autorise de plus grosses pièces jointes, ou essayez avec l'un des miroirs ci-dessous :\n" +"\n" +"https://www.oignon.net/dist/torbrowser/\n" +"https://tor.beme-it.de/dist/torbrowser/\n" +"https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Nov '11

18 Nov '11

commit dce140c40dd479c55af6b9a7a6ba6644e9251b67 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 18 09:45:27 2011 +0000 Update translations for vidalia_help --- nl/config.po | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/nl/config.po b/nl/config.po index c9076ac..49deb99 100644 --- a/nl/config.po +++ b/nl/config.po @@ -2,13 +2,14 @@ # Translators: # <flabber(a)online.be>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. +# Shondoit Walker <shondoit+transifex(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2011-09-28 17:54+0000\n" -"Last-Translator: flabber <flabber(a)online.be>\n" +"PO-Revision-Date: 2011-11-18 09:30+0000\n" +"Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -236,6 +237,12 @@ msgid "" "language from the dropdown box. You will need to restart Vidalia after " "changing the displayed language for the changes to take effect." msgstr "" +"<b>Taal</b>: Vidalia's interface is vertaald naar veel verschillende talen " +"door behulpzame vrijwilligers. Wanneer Vidalia voor de eerste keer opstart " +"probeert het te raden welke taal je computer momenteel gebruikt. Als Vidalia" +" verkeerd raadt of je hebt de voorkeur voor een andere taal, kan je een " +"andere taal kiezen uit de keuzelijst. Je moet Vidalia herstarten na de taal " +"aangepast te hebben om de aanpassingen zichtbaar te maken." #. type: Content of: <html><body><ul><li> #: en/config.html:124 @@ -275,6 +282,11 @@ msgid "" "have a conflict with another service on your machine, or if you are using " "Vidalia to control and monitor a Tor process running on another machine." msgstr "" +"<b>Control adres &ampl poort</b>: De <i>control poort</i> is de poort die " +"Vidalia gebruikt om te praten met Tor. Dit hoeft niet te worden aangepast " +"tenzij je een conflict hebt met een andere service op je machine, of als je " +"Vidalia gebruikt om een Tor proces op een andere machine te beheren en " +"monitoren." #. type: Content of: <html><body><ul><li> #: en/config.html:144

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Nov '11

18 Nov '11

commit 8ab9015c75339ee351106f2860effd9336b6d97d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 18 03:15:25 2011 +0000 Update translations for vidalia_help --- es/config.po | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 73 insertions(+), 7 deletions(-) diff --git a/es/config.po b/es/config.po index ebb4863..afe0709 100644 --- a/es/config.po +++ b/es/config.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2011-11-18 02:45+0000\n" +"PO-Revision-Date: 2011-11-18 02:49+0000\n" "Last-Translator: Gioyik <gioyik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -187,6 +187,16 @@ msgid "" "relays</a> for more information on how to learn new bridge relay addresses " "and fingerprints." msgstr "" +"Incluso si usted no sabe todas las direcciones de transmisor de puente, " +"marcando esta casilla de verificación todavía puede ser útil. Tor cifrará " +"sus solicitudes de directorio, que puede derrotar a los mecanismos de " +"bloqueo que tratan de filtrar Tor solicitudes de información acerca de otros" +" relés. Si las conexiones a la normalidad los repetidores Tor también se " +"bloquean, entonces usted tendrá que aprender una dirección transmisor de " +"puente de alguna manera y añadir aquí. Ver el tema de ayuda en <a " +"href=\"bridges.html#finding\">la búsqueda relés puente</a> para obtener más " +"información sobre cómo aprender nuevas direcciones repetidor de puente y las" +" huellas dactilares." #. type: Content of: <html><body> #: en/config.html:100 @@ -204,16 +214,19 @@ msgid "" "<i> See <a href=\"server.html\">this help topic</a> for detailed information" " about setting up and managing a Tor relay. </i>" msgstr "" +"<i>Ver <a href=\"server.html\">este tema de ayuda</a> para obtener " +"información detallada sobre la configuración y la gestión de un servidor " +"Tor.</i>" #. type: Content of: <html><body> #: en/config.html:109 msgid "<a name=\"appearance\"/>" -msgstr "" +msgstr "<a name=\"appearance\"/>" #. type: Content of: <html><body><h3> #: en/config.html:110 msgid "Appearance Settings" -msgstr "" +msgstr "Configuración de Apariencia" #. type: Content of: <html><body><p> #: en/config.html:112 @@ -221,6 +234,8 @@ msgid "" "The settings on the <i>Appearance</i> page allow you to customize the look " "and feel of Vidalia." msgstr "" +"La configuración de la página de <i>Apariencia</i> le permiten personalizar " +"el aspecto y la sensación de Vidalia." #. type: Content of: <html><body><ul><li> #: en/config.html:116 @@ -232,6 +247,13 @@ msgid "" "language from the dropdown box. You will need to restart Vidalia after " "changing the displayed language for the changes to take effect." msgstr "" +"<b>Idioma:</b> interfaz de Vidalia ha sido traducido a varios idiomas por " +"voluntarios de ayuda. Cuando Vidalia se ejecuta por primera vez, se tratará " +"de adivinar el idioma de su equipo que está utilizando actualmente. Si " +"adivina Vidalia incorrectamente, o si lo prefiere un idioma diferente, puede" +" elegir otro idioma en el menú desplegable. Usted tendrá que reiniciar " +"Vidalia después de cambiar el idioma que se muestra para que los cambios " +"surtan efecto." #. type: Content of: <html><body><ul><li> #: en/config.html:124 @@ -240,16 +262,20 @@ msgid "" "default interface style. If you dislike the default, you can choose " "whichever interface style you prefer from the dropdown box." msgstr "" +"<b>Estilo:</b> En la mayoría de los casos, Vidalia de forma predeterminada " +"con el estilo de su plataforma de interfaz por defecto. Si no te gusta el " +"valor por defecto, puede elegir el estilo de interfaz que prefiera en el " +"cuadro desplegable." #. type: Content of: <html><body> #: en/config.html:131 msgid "<a name=\"advanced\"/>" -msgstr "" +msgstr "<a name=\"advanced\"/>" #. type: Content of: <html><body><h3> #: en/config.html:132 msgid "Advanced Settings" -msgstr "" +msgstr "Configuración avanzada" #. type: Content of: <html><body><p> #: en/config.html:134 @@ -257,6 +283,8 @@ msgid "" "The settings on the <i>Advanced</i> page should generally only be modified " "by more experienced users." msgstr "" +"La configuración de la página de opciones <i>avanzadas</i> en general, sólo " +"deben ser modificados por los usuarios más experimentados." #. type: Content of: <html><body><ul><li> #: en/config.html:138 @@ -266,6 +294,11 @@ msgid "" "have a conflict with another service on your machine, or if you are using " "Vidalia to control and monitor a Tor process running on another machine." msgstr "" +"<b>Dirección y Control de Puerto:</b> El <i>puerto de control</i> es el " +"puerto que Vidalia usa para comunicarse con Tor. Esto no tiene que ser " +"cambiado a menos que tenga un conflicto con otro servicio en su máquina, o " +"si usted está usando Vidalia para controlar y supervisar un proceso de Tor " +"se ejecuta en otra máquina." #. type: Content of: <html><body><ul><li> #: en/config.html:144 @@ -274,6 +307,10 @@ msgid "" "limit the applications on your machine that can connect to and reconfigure " "your Tor installation. The available authentication methods are:" msgstr "" +"<b>Control de autenticación de puertos:</b> Puerto de control de " +"autenticación se utiliza para limitar las aplicaciones en su equipo que " +"puede conectarse y configurar de nuevo la instalación de Tor. Los métodos de" +" autenticación disponibles son:" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:150 @@ -282,6 +319,9 @@ msgid "" "<b>strongly</b> discouraged. Any application or user on your computer can " "reconfigure your Tor installation." msgstr "" +"<b>Ninguno</b> - No se requiere autenticación. El uso de esta opción no " +"<b>se</b> recomienda. Cualquier aplicación o usuario en el equipo puede " +"volver a configurar su instalación de Tor." #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:155 @@ -292,6 +332,12 @@ msgid "" "Vidalia randomly generate a new password each time it starts Tor by checking" " the <i>Randomly Generate</i> checkbox." msgstr "" +"<b>Contraseña</b> <i>(por defecto)</i> - Si se selecciona este método, puede" +" especificar una contraseña que Tor se requieren cada vez que un usuario o " +"una aplicación se conecta al puerto de control de Tor. Si Vidalia ejecute " +"Tor, puede hacer que Vidalia generar aleatoriamente una contraseña nueva " +"cada vez que se inicia Tor, marcando la casilla de verificación <i>Generar " +"al azar.</i>" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:162 @@ -301,6 +347,11 @@ msgid "" "starts. Any user or application that tries to connect to Tor's control port " "must be able to provide the contents of this cookie." msgstr "" +"<b>Cookie</b> - Si se selecciona la autenticación de cookies, Tor escribir " +"un archivo (o <i>cookie)</i> que contiene bytes aleatorios a su directorio " +"de datos cuando se inicia. Cualquier usuario o aplicación que intenta " +"conectarse al puerto de control de Tor tiene que ser capaz de proporcionar " +"el contenido de esta cookie." #. type: Content of: <html><body><ul><li> #: en/config.html:170 @@ -310,6 +361,10 @@ msgid "" "file. If you leave this field blank, Tor will uses its own default torrc " "location." msgstr "" +"<b>Tor archivo de configuración</b> <i>(opcional):</i> Puede usar esta " +"opción para que Vidalia Tor comenzar con un <i>torrc</i> específicos, " +"archivos de configuración de Tor. Si deja este campo en blanco, Tor utiliza " +"su propia ubicación torrc por defecto." #. type: Content of: <html><body><ul><li> #: en/config.html:175 @@ -319,6 +374,11 @@ msgid "" "information, Tor relay keys, and configuration files. If you leave this " "field blank, Tor will use its own default data directory location." msgstr "" +"<b>Tor Directorio de datos</b> <i>(opcional):</i> Se puede especificar el " +"directorio en el que Tor almacenará sus datos guardados, como la información" +" almacenada en caché servidor Tor, Tor llaves del relé, y archivos de " +"configuración. Si deja este campo en blanco, Tor hará uso de su propio " +"incumplimiento ubicación del directorio de datos." #. type: Content of: <html><body><ul><li> #: en/config.html:181 @@ -328,16 +388,20 @@ msgid "" " starts. If you enter a value for <b>Run as Group</b>, Tor will " "<i>setgid</i> to this group when it starts." msgstr "" +"<b>Permisos</b> <i>(opcional, no está disponible en Windows):</i> Si se " +"introduce un valor para <b>Ejecutar como usuario,</b> Tor <i>setuid</i> a " +"este usuario cuando se inicia. Si introduce un valor para <b>Ejecutar como " +"grupo,</b> Tor <i>setgid</i> a este grupo cuando se inicia." #. type: Content of: <html><body> #: en/config.html:189 msgid "<a name=\"services\"/>" -msgstr "" +msgstr "<a name=\"services\"/>" #. type: Content of: <html><body><h3> #: en/config.html:190 msgid "Hidden Service Settings" -msgstr "" +msgstr "Configuración de servicio oculto" #. type: Content of: <html><body><p> #: en/config.html:192 @@ -345,5 +409,7 @@ msgid "" "Hidden services allow you to provide any kind of TCP-based service, e.g. an" " HTTP service, to others without revealing your IP address." msgstr "" +"Servicios ocultos le permiten ofrecer cualquier tipo de servicio basado en " +"TCP, por ejemplo, un servicio HTTP, a los demás sin revelar su dirección IP."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Nov '11

18 Nov '11

commit 1477490a6365f3770a96d34d1cc39643e15ba127 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 18 02:45:23 2011 +0000 Update translations for vidalia_help --- es/config.po | 30 +++++++++++++---- es/links.po | 29 ++++++++++------- es/netview.po | 98 ++++++++++++++++++++++++++++++++++++++++++++------------ es/running.po | 26 +++++++++++++-- 4 files changed, 139 insertions(+), 44 deletions(-) diff --git a/es/config.po b/es/config.po index 76ff01f..ebb4863 100644 --- a/es/config.po +++ b/es/config.po @@ -1,14 +1,15 @@ # # Translators: # Ernesto Bernal <ernesto_pow(a)hotmail.com>, 2011. +# <gioyik(a)gmail.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2011-10-10 13:16+0000\n" -"Last-Translator: ernestob <ernesto_pow(a)hotmail.com>\n" +"PO-Revision-Date: 2011-11-18 02:45+0000\n" +"Last-Translator: Gioyik <gioyik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -127,6 +128,12 @@ msgid "" "list of ports permitted by your firewall or proxy, separated by commas. " "(<i>Example: 80,443,8080</i>)" msgstr "" +"<b>Mi cortafuegos sólo me permite conectarse a determinados puertos:</b> Si " +"estás detrás de un firewall o proxy restrictivo que limita los puertos que " +"son capaces de conectarse, puede configurar Tor para conectarse directamente" +" sólo a los relés de escucha en los puertos permitidos por el firewall o " +"proxy . Basta con introducir una lista de puertos permitido por el firewall " +"o proxy, separados por comas. <i>(Ejemplo: 80,443,8080)</i>" #. type: Content of: <html><body><ul><li> #: en/config.html:69 @@ -138,26 +145,35 @@ msgid "" "or newer only). You can add bridge relays by specifying either their address" " and port number, or their address, port number, and fingerprint." msgstr "" +"<b>Mi ISP bloquea conexiones a la red Tor:</b> Si se conecta a su ISP " +"(Internet Service Provider) bloquea a la red Tor, Tor puede tratar de evitar" +" ser filtrada mediante el cifrado de sus conexiones de directorio y la " +"conexión a la red de Tor a través de relés llamados <i>puentes</i> (Tor " +"0.2.0.3-alpha o posterior solamente). Usted puede agregar relés puente " +"especificando su dirección y número de puerto, o su dirección, número de " +"puerto, y la huella digital." #. type: Content of: <html><body><ul><li> #: en/config.html:77 msgid "Below are examples of valid bridge address formats:" msgstr "" +"A continuación se muestran ejemplos de formatos válidos para el puente de la" +" dirección:" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:80 msgid "128.213.48.13:8080" -msgstr "" +msgstr "128.213.48.13:8080" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:83 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" -msgstr "" +msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:86 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" -msgstr "" +msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 @@ -175,12 +191,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:100 msgid "<a name=\"relay\"/>" -msgstr "" +msgstr "<a name=\"relay\"/>" #. type: Content of: <html><body><h3> #: en/config.html:101 msgid "Relay Settings" -msgstr "" +msgstr "Configuración del relé" #. type: Content of: <html><body><p> #: en/config.html:103 diff --git a/es/links.po b/es/links.po index 1ddedd9..c24db52 100644 --- a/es/links.po +++ b/es/links.po @@ -1,12 +1,13 @@ # # Translators: +# <gioyik(a)gmail.com>, 2011. 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: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-18 02:42+0000\n" +"Last-Translator: Gioyik <gioyik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,22 +18,22 @@ msgstr "" #. type: Content of: <html><body><h1> #: links.html:16 msgid "Helpful Links" -msgstr "" +msgstr "Enlaces útiles" #. type: Content of: <html><body><h3> #: links.html:19 msgid "Vidalia" -msgstr "" +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 "" +msgstr "   " #. type: Content of: <html><body><table><tr><td> #: links.html:23 links.html:43 msgid "Homepage" -msgstr "" +msgstr "Página principal" #. type: Content of: <html><body><table><tr><td> #: links.html:25 @@ -40,31 +41,33 @@ 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 "" +msgstr "Wiki y 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 "" +msgstr "<a href=\"http://trac.torproject.org/\">http://trac.torproject.org/</a>" #. type: Content of: <html><body><h3> #: links.html:39 msgid "Tor" -msgstr "" +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 "" +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 "" +msgstr "FAQ" #. type: Content of: <html><body><table><tr><td> #: links.html:52 @@ -72,10 +75,12 @@ 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 "" +msgstr "<a href=\"https://trac.torproject.org/\">https://trac.torproject.org/</a>" diff --git a/es/netview.po b/es/netview.po index 0eecaac..2e2d7f1 100644 --- a/es/netview.po +++ b/es/netview.po @@ -1,12 +1,13 @@ # # Translators: +# <gioyik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-18 02:41+0000\n" +"Last-Translator: Gioyik <gioyik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/netview.html:16 msgid "Network Viewer" -msgstr "" +msgstr "Visor de redes" #. type: Content of: <html><body><p> #: en/netview.html:20 @@ -25,16 +26,18 @@ msgid "" "The network viewer lets you see relays in the Tor network and where your " "traffic is going." msgstr "" +"El visor de red le permite ver los relés de la red Tor, y donde el tráfico " +"va." #. type: Content of: <html><body> #: en/netview.html:25 msgid "<a name=\"overview\"/>" -msgstr "" +msgstr "<a name=\"información general\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:26 msgid "Overview" -msgstr "" +msgstr "Información general" #. type: Content of: <html><body><p> #: en/netview.html:28 @@ -45,16 +48,22 @@ msgid "" "then sent as a <i>stream</i> through that circuit. For efficiency, multiple " "streams may share the same circuit." msgstr "" +"Cuando se quiere comunicar de forma anónima a través de Tor (por ejemplo, la" +" conexión a un sitio web), Tor crea un túnel, o el <i>circuito</i> de " +"conexiones encriptadas a través de una serie de repetidores en la red. El " +"tráfico de la aplicación se envía como una <i>secuencia</i> a través de ese " +"circuito. Por eficiencia, múltiples flujos pueden compartir el mismo " +"circuito." #. type: Content of: <html><body> #: en/netview.html:35 msgid "<a name=\"netmap\"/>" -msgstr "" +msgstr "<a name=\"netmap\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:36 msgid "Network Map" -msgstr "" +msgstr "Mapa de la red" #. type: Content of: <html><body><p> #: en/netview.html:38 @@ -64,6 +73,10 @@ msgid "" " are drawn between relays to indicate the path of circuits that your Tor " "client has created through the Tor network." msgstr "" +"El mapa de la red se compone de un mapa del mundo, con puntitos de color " +"rojo que indica la ubicación geográfica de los relés de la red Tor. Las " +"líneas verdes se dibujan entre los relés para indicar la ruta de los " +"circuitos que su cliente Tor ha creado a través de la red Tor." #. type: Content of: <html><body><p> #: en/netview.html:44 @@ -73,6 +86,10 @@ msgid "" "map by clicking on the map and then dragging it in whatever direction you " "would like to move the map." msgstr "" +"Usted puede acercarse a lugares en el mapa haciendo clic en el botón <b>Zoom" +" In</b> y <b>Zoom Out</b> en la barra de herramientas. También puede " +"desplazarse por el mapa haciendo clic en el mapa y arrastrarlo en cualquier " +"dirección que desea mover el mapa." #. type: Content of: <html><body><p> #: en/netview.html:50 @@ -81,6 +98,9 @@ msgid "" "address of the relay in a GeoIP database, created by MaxMind and located at " "geoip.vidalia-project.net." msgstr "" +"La ubicación geográfica de un servidor Tor está determinada por buscar la " +"dirección IP del relé en una base de datos GeoIP, creado por MaxMind y está " +"ubicado en geoip.vidalia-project.net." #. type: Content of: <html><body><p> #: en/netview.html:55 @@ -94,16 +114,25 @@ msgid "" " not revealed to the GeoIP relay. The results of the lookups will be cached " "locally in order to reduce load on Vidalia's GeoIP relays." msgstr "" +"En el medio del diálogo, por debajo del mapa de red, verá una lista de sus " +"circuitos de corriente, así como cualquier tráfico de las aplicaciones " +"actualmente en los circuitos. Cuando el mapa de la red se carga por primera," +" es probable que vea una conexión a geoip.vidalia-project.net, que ocurre " +"cuando Vidalia va a buscar información geográfica para la lista de " +"repetidores Tor. Es importante señalar que esta solicitud se hace a través " +"de Tor, por lo que su ubicación no se revela al relé GeoIP. Los resultados " +"de las búsquedas se almacenan en caché localmente con el fin de reducir la " +"carga en los relés de GeoIP de Vidalia." #. type: Content of: <html><body> #: en/netview.html:66 msgid "<a name=\"relaylist\"/>" -msgstr "" +msgstr "<a name=\"relaylist\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:67 msgid "Relay Status" -msgstr "" +msgstr "Estado del relé" #. type: Content of: <html><body><p> #: en/netview.html:69 @@ -112,11 +141,14 @@ msgid "" "Tor network. Next to each relay is an icon indicating that relay's status. " "The following table summarizes the possible relay status icons:" msgstr "" +"En el lado izquierdo de la vista de red, verá una lista de enlaces en la red" +" Tor. Al lado de cada relé es un icono que indica el estado que relé. La " +"siguiente tabla resume los iconos de relé de estado posibles:" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:78 msgid "The relay is offline or simply not responding." -msgstr "" +msgstr "El relé está en línea o simplemente no responde." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:84 @@ -124,26 +156,32 @@ msgid "" "The relay is <i>hibernating</i>, meaning it is online, but has used up as " "much bandwidth as the operator is willing to allow for a given time period." msgstr "" +"El relé está en <i>hibernación,</i> lo que significa que está en línea, pero" +" ha utilizado al ancho de banda que el operador está dispuesto a permitir un" +" periodo de tiempo determinado." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:92 msgid "The relay is online, but has shown only minimal throughput." -msgstr "" +msgstr "El relé está en línea, pero sólo ha mostrado el rendimiento mínimo." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:98 msgid "The relay is online and has shown a throughput >= 20 KB/s." msgstr "" +"El relé está en línea y ha mostrado un rendimiento de> = 20 KB / s." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:104 msgid "The relay is online and has shown a throughput >= 60 KB/s." msgstr "" +"El relé está en línea y ha mostrado un rendimiento de> = 60 KB / s." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:110 msgid "The relay is online and has shown a throughput >= 400 KB/s." msgstr "" +"El relé está en línea y ha mostrado un rendimiento de> = 400 KB / s." #. type: Content of: <html><body><p> #: en/netview.html:116 @@ -152,16 +190,19 @@ msgid "" "maximum bandwidth sustained input or output over any ten second period in " "the past day." msgstr "" +"Todos los valores de ancho de banda son estimaciones basadas en el mínimo de" +" ancho de banda ya sea la entrada o salida máxima sostenida en un período de" +" diez segundos en el último día." #. type: Content of: <html><body> #: en/netview.html:122 msgid "<a name=\"details\"/>" -msgstr "" +msgstr "<a name=\"details\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:123 msgid "Relay Details" -msgstr "" +msgstr "Detalles del relé" #. type: Content of: <html><body><p> #: en/netview.html:125 @@ -172,6 +213,12 @@ msgid "" " in the list of your current circuits and streams, this panel will show you " "details about each relay through which your traffic is currently being sent." msgstr "" +"El panel de detalles del relé esta en el lado derecho de la pantalla le da " +"detalles sobre el relé o relés seleccionados en la <a " +"href=\"#relaylist\">lista de retransmisión</a> . Si ha seleccionado un " +"circuito de corriente o en la lista de sus circuitos de corriente y arroyos," +" este panel le mostrará información detallada sobre cada relé a través del " +"cual es actualmente el tráfico que se envía." #. type: Content of: <html><body><p> #: en/netview.html:132 @@ -179,31 +226,33 @@ msgid "" "The fields that you may see in the panel are as follows (<i>Note</i>: not " "all of these fields will always be present):" msgstr "" +"Los campos que puede ver en el panel son las siguientes (<i>Nota:</i> No " +"todos estos campos siempre estarán presentes):" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:138 msgid "<b>Location</b>" -msgstr "" +msgstr "<b>Ubicación</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:139 msgid "The geographic location of this Tor relay." -msgstr "" +msgstr "La ubicación geográfica de este servidor Tor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:142 msgid "<b>IP Address</b>" -msgstr "" +msgstr "<b>Dirección IP</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:143 msgid "IP address at which this Tor relay can be reached." -msgstr "" +msgstr "Dirección IP a la que puede ser este servidor Tor alcanzado." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:146 msgid "<b>Platform</b>" -msgstr "" +msgstr "<b>Plataforma</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:148 @@ -211,11 +260,13 @@ msgid "" "Operating system information and Tor version on which this relay is " "currently running." msgstr "" +"Funcionamiento del sistema de información y la versión de Tor en el que este" +" relevo se está ejecutando actualmente." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:153 msgid "<b>Bandwidth</b>" -msgstr "" +msgstr "<b>Ancho de banda</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:155 @@ -223,11 +274,13 @@ msgid "" "Estimated maximum amount of bandwidth that the directory relays have seen " "this relay handle recently." msgstr "" +"Importe estimado máximo de ancho de banda que los enlaces del directorio han" +" visto manejar relevo recientemente." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:160 msgid "<b>Uptime</b>" -msgstr "" +msgstr "<b>El tiempo de actividad</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:162 @@ -235,15 +288,18 @@ msgid "" "Length of time this relay has been available, which can be used to help " "estimate this relay's stability." msgstr "" +"Duración de este relevo ha estado disponible, que puede ser usado para " +"ayudar a estimar la estabilidad de este relé." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:167 msgid "<b>Last Updated</b>" -msgstr "" +msgstr "<b>Última actualización</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:168 msgid "Date this relay's information was last updated." msgstr "" +"Información actualizada sobre este relevo fue actualizada por última vez." diff --git a/es/running.po b/es/running.po index 5218cf4..74273f8 100644 --- a/es/running.po +++ b/es/running.po @@ -1,13 +1,14 @@ # # Translators: +# <gioyik(a)gmail.com>, 2011. # <lenazun(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-10-22 20:11+0000\n" -"Last-Translator: lenazun <lenazun(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-18 02:32+0000\n" +"Last-Translator: Gioyik <gioyik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -120,7 +121,7 @@ msgstr "<a name=\"monitoring\"/>" #. type: Content of: <html><body><h3> #: en/running.html:58 msgid "Monitoring Tor's Status" -msgstr "" +msgstr "Supervisar el estado de Tor" #. type: Content of: <html><body><p> #: en/running.html:60 @@ -129,12 +130,17 @@ msgid "" "system tray or dock area. The following table shows the different states " "indicated by an icon in your system's notification area:" msgstr "" +"Vidalia le informa sobre el estado de Tor mostrando un icono en la bandeja " +"del sistema. La siguiente tabla muestra los diferentes estados indicados " +"mediante un icono en el área de notificación de su sistema:" #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:69 msgid "" "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor." msgstr "" +"Tor se detiene. Seleccione <i>Inicio</i> en el menú de Vidalia para iniciar " +"Tor." #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:76 @@ -142,6 +148,9 @@ msgid "" "Tor is starting up. You can check the <a href=\"log.html\">message log</a> " "for status information about Tor while it is starting." msgstr "" +"Tor se está iniciando. Puede comprobar el <a href=\"log.html\">log de " +"mensajes</a> de información del estado de Tor, mientras que se está " +"iniciando." #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:84 @@ -151,11 +160,15 @@ msgid "" "href=\"log.html\">message log</a> while it is running, if you want to see " "what Tor is doing." msgstr "" +"Tor se está ejecutando. Si desea dejar Tor, seleccione <i>Detener</i> en el " +"menú de Vidalia. Tor muestra mensajes informativos al <a " +"href=\"log.html\">log de mensajes</a> mientras se está ejecutando, si usted " +"quiere ver lo que Tor está haciendo." #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:92 msgid "Tor is in the process of shutting down." -msgstr "" +msgstr "Tor se encuentra en el proceso de apagado." #. type: Content of: <html><body><p> #: en/running.html:98 @@ -165,5 +178,10 @@ msgid "" "You can also check the <a href=\"log.html\">message log</a> for details " "about any problems Tor encountered before it exited." msgstr "" +"Si sale inesperadamente Tor, Vidalia cambia su icono a la cebolla oscura con" +" una X de color rojo y un mensaje de error que le permite saber lo que salió" +" mal. También puede consultar el <a href=\"log.html\">log de mensajes</a> " +"para obtener más información acerca de cualquier problema encontrado en Tor " +"antes de su salida."

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 18 Nov '11

18 Nov '11

commit fcd066745ca6bf40f7b999d4f412d1d7711581c0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 18 02:45:02 2011 +0000 Update translations for gettor --- es/gettor.po | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index 059ac8d..d70133f 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <gioyik(a)gmail.com>, 2011. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. # <lenazun(a)gmail.com>, 2011. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2011-11-14 04:06+0000\n" -"Last-Translator: lenazun <lenazun(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-18 02:28+0000\n" +"Last-Translator: Gioyik <gioyik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,6 +63,8 @@ msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" msgstr "" +"Si usted tiene alguna pregunta o porque no funciona, puede comunicarse con una\n" +"persona en esta dirección de correo electrónico de apoyo: help(a)rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -605,5 +608,12 @@ msgid "" " https://tor.beme-it.de/dist/torbrowser/\n" " https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" msgstr "" +"Lo sentimos, pero el paquete que ha solicitado (%s) es demasiado grande para su \n" +"proveedor para aceptarlo como un archivo adjunto. Trate de usar otro proveedor que permite \n" +"adjuntos de correo electrónico más grande. O pruebe uno de los siguientes mirrors o enlaces: \n" +"\n" +" https://www.oignon.net/dist/torbrowser/ \n" +" https://tor.beme-it.de/dist/torbrowser/ \n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/ "

1 0

[torflow/master] Forgot a spec paragraph..
by mikeperry＠torproject.org 17 Nov '11

17 Nov '11

commit 8a1dbea9f89ca3e5d600662241dadc2e71a6c0bf Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Nov 17 15:56:21 2011 -0800 Forgot a spec paragraph.. --- NetworkScanners/BwAuthority/README.spec.txt | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index 5ccf672..b8f86d4 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -527,7 +527,11 @@ itself. It also has the advantage of allowing the PID control code to be - exercised, yet produce identical results to Section 2 with - the following additional constants: + exercised, yet to still produce identical results to Section 2 + by using the following consensus parameters: - + bwauthpid=1 bwauthdescbw=1 bwauthbestratio=1 bwauthcircs=0 + bwauthkp=10000 bwauthti=0 bwauthtd=0 + + This equivalence was proved in Section 3.1, and has been observed + in practice.

1 0

[torflow/master] node sample rate idea.
by mikeperry＠torproject.org 17 Nov '11

17 Nov '11

commit 34afb642f6e1cebf386e1034b213b69b0144d7c7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Oct 29 01:09:16 2011 -0700 node sample rate idea. About to hit to chopping block. --- NetworkScanners/BwAuthority/aggregate.py | 283 ++++++++++++++++++++---------- 1 files changed, 194 insertions(+), 89 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 712a9c5..1462f9b 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -20,38 +20,24 @@ prev_consensus = {} # Hack to kill voting on guards while the network rebalances IGNORE_GUARDS = 0 -# BETA is the parameter that governs the proportion that we use previous -# consensus values in creating new bandwitdhs versus descriptor values. -# 1.0 -> all consensus -# 0 -> all descriptor, -# -1 -> compute from %age of nodes upgraded to 0.2.1.17+ -# Note that guard nodes may not quickly change load in the presence of -# changes to their advertised bandwidths. To address this and other -# divergent behaviors, we only apply this value to nodes with ratios < 1.0 -#BETA = -1 -BETA = 0 - -# GUARD_BETA is the version of BETA used for guard nodes. It needs -# to be computed similarly to BETA, but using 0.2.1.22+ and 0.2.2.7+ -# because guard nodes were weighted uniformly by clients up until then. -#GUARD_BETA = -1 -GUARD_BETA = 0 - -# ALPHA is the parameter that controls the amount measurement -# values count for. It is used to dampen feedback loops to prevent -# values from changing too rapidly. Thus it only makes sense to -# have a value below 1.0 if BETA is nonzero. -# ALPHA is only applied for nodes with ratio < 1 if BETA is nonzero. -#ALPHA = 0.25 -ALPHA = 0 - -# There are cases where our updates may not cause node -# traffic to quickly relocate, such as Guard-only nodes. These nodes -# get a special ALPHA when BETA is being used: -# GUARD_ALPHA is only applied for Guard-only nodes with ratio < 1 if BETA is -# nonzero. -#GUARD_ALPHA = 0.1 -GUARD_ALPHA = 0 +# The guard measurement period is based on the client turnover +# rate for guard nodes +GUARD_SAMPLE_RATE = 2*7*24*60*60 # 2wks + +# PID constants +# See https://en.wikipedia.org/wiki/PID_controller#Ideal_versus_standard_PID_form +K_p = 1.0 + +# We expect to correct steady state error in 4 samples +T_i = 4 + +# We can only expect to predict less than one sample into the future, as +# after 1 sample, clients will have migrated +# FIXME: This is a function of the consensus time.. +T_d = 0.5 + +K_i = K_p/T_i +K_d = K_p*T_d NODE_CAP = 0.05 @@ -112,15 +98,43 @@ class Node: self.chosen_fbw = None self.sbw_ratio = None self.fbw_ratio = None + self.pid_error = 0 + self.prev_error = 0 + self.prev_voted_at = 0 + self.pid_error_sum = 0 + self.derror_dt = 0 self.ratio = None self.new_bw = None self.change = None + self.bw_idx = 0 self.strm_bw = [] self.filt_bw = [] self.ns_bw = [] self.desc_bw = [] self.timestamps = [] + # Derivative of error for pid control + def pid_bw(self, bw_idx, dt): + return self.ns_bw[bw_idx] \ + + K_p*self.ns_bw[bw_idx]*self.pid_error \ + + K_i*self.ns_bw[bw_idx]*self.integral_error(dt) \ + + K_d*self.ns_bw[bw_idx]*self.d_error_dt(dt) + + # Time-weighted sum of error per unit of time, scaled + # to arbitrary units of 'dt' seconds + def integral_error(self, dt): + return (self.pid_error_sum * GUARD_SAMPLE_RATE) / dt + + # Rate of error per unit of time, scaled to arbitrary + # units of 'dt' seconds + def d_error_dt(self, dt): + if self.prev_voted_at == 0 or self.prev_error == 0: + self.derror_dt = 0 + else: + self.derror_dt = ((dt*self.pid_error - dt*self.prev_error) / \ + (self.chosen_time - self.prev_voted_at)) + return self.derror_dt + def add_line(self, line): if self.idhex and self.idhex != line.idhex: raise Exception("Line mismatch") @@ -206,6 +220,63 @@ class Line: self.slice_file = slice_file self.timestamp = timestamp +class Vote: + def __init__(self, line): + # node_id=$DB8C6D8E0D51A42BDDA81A9B8A735B41B2CF95D1 bw=231000 diff=209281 nick=rainbowwarrior measured_at=1319822504 + self.idhex = re.search("[\s]*node_id=([\S]+)[\s]*", line).group(1) + self.nick = re.search("[\s]*nick=([\S]+)[\s]*", line).group(1) + self.bw = int(re.search("[\s]*bw=([\S]+)[\s]*", line).group(1)) + self.measured_at = int(re.search("[\s]*measured_at=([\S]+)[\s]*", line).group(1)) + try: + self.pid_error = float(re.search("[\s]*pid_error=([\S]+)[\s]*", line).group(1)) + self.pid_error_sum = float(re.search("[\s]*pid_error_sum=([\S]+)[\s]*", line).group(1)) + self.vote_time = int(re.search("[\s]*vote_time=([\S]+)[\s]*", line).group(1)) + except: + plog("NOTICE", "No previous PID data.") + self.pid_error = 0 + self.pid_error_sum = 0 + self.vote_time = 0 + +class VoteSet: + def __init__(self, filename): + self.vote_map = {} + try: + f = file(filename, "r") + f.readline() + for line in f.readlines(): + vote = Vote(line) + self.vote_map[vote.idhex] = vote + except IOError: + plog("NOTICE", "No previous vote data.") + pass + +# Misc items we need to get out of the consensus +class ConsensusJunk: + def __init__(self, c): + cs_bytes = c.sendAndRecv("GETINFO dir/status-vote/current/consensus\r\n")[0][2] + self.bwauth_pid_control = False + try: + cs_params = re.search("^params ((?:[\S]+=[\d]+[\s]?)+)", + cs_bytes, re.M).split() + for p in cs_params: + if p == "bwauthpid=1": + self.bwauth_pid_control = True + except: + plog("NOTICE", "Bw auth PID control disabled due to parse error.") + traceback.print_exc() + + self.bw_weights = {} + try: + bw_weights = re.search("^bandwidth-weights ((?:[\S]+=[\d]+[\s]?)+)", + cs_bytes, re.M).groups(1)[0].split() + for b in bw_weights: + pair = b.split("=") + self.bw_weights[pair[0]] = int(pair[1])/10000.0 + except: + plog("WARN", "No bandwidth weights in consensus!") + self.bw_weights["Wgd"] = 0 + self.bw_weights["Wgg"] = 1.0 + def main(argv): TorUtil.read_config(argv[1]+"/scanner.1/bwauthority.cfg") TorUtil.loglevel = "NOTICE" @@ -226,38 +297,7 @@ def main(argv): got_ns_bw = False max_rank = len(ns_list) - global BETA - sorted_rlist = None - if BETA == -1: - # Compute beta based on the upgrade rate for nsbw obeying routers - # (karsten's data show this slightly underestimates client upgrade rate) - nsbw_yes = VersionRangeRestriction("0.2.1.17") - sorted_rlist = c.read_routers(ns_list) - - nsbw_cnt = 0 - non_nsbw_cnt = 0 - for r in sorted_rlist: - if nsbw_yes.r_is_ok(r): nsbw_cnt += 1 - else: non_nsbw_cnt += 1 - BETA = float(nsbw_cnt)/(nsbw_cnt+non_nsbw_cnt) - - global GUARD_BETA - if GUARD_BETA == -1: - # Compute GUARD_BETA based on the upgrade rate for nsbw obeying routers - # (karsten's data show this slightly underestimates client upgrade rate) - guardbw_yes = NodeRestrictionList([VersionRangeRestriction("0.2.1.23"), - NotNodeRestriction(VersionRangeRestriction("0.2.2.0", "0.2.2.6"))]) - - if not sorted_rlist: - sorted_rlist = c.read_routers(ns_list) - - guardbw_cnt = 0 - non_guardbw_cnt = 0 - for r in sorted_rlist: - if guardbw_yes.r_is_ok(r): guardbw_cnt += 1 - else: non_guardbw_cnt += 1 - GUARD_BETA = float(guardbw_cnt)/(guardbw_cnt+non_guardbw_cnt) - + cs_junk = ConsensusJunk(c) # FIXME: This is poor form.. We should subclass the Networkstatus class # instead of just adding members @@ -301,6 +341,7 @@ def main(argv): # This filter is just to remove REALLY old files if time.time() - timestamp > MAX_AGE: plog("DEBUG", "Skipping old file "+f) + # FIXME: Unlink this file + sql- continue if timestamp > newest_timestamp: newest_timestamp = timestamp @@ -361,39 +402,99 @@ def main(argv): plog("DEBUG", "Network true_strm_avg: "+str(true_strm_avg)) plog("DEBUG", "Network true_filt_avg: "+str(true_filt_avg)) + prev_votes = None + if cs_junk.bwauth_pid_control: + prev_votes = VoteSet(argv[-1]) + + guard_cnt = 0 + node_cnt = 0 + guard_measure_time = 0 + node_measure_time = 0 + for n in nodes.itervalues(): + if n.idhex in prev_votes.vote_map and n.idhex in prev_consensus: + if "Guard" in prev_consensus[n.idhex].flags: + guard_cnt += 1 + guard_measure_time += (n.timestamps[n.chosen_fbw] - \ + prev_votes.vote_map[n.idhex].measured_at) + else: + node_cnt += 1 + node_measure_time += (n.timestamps[n.chosen_fbw] - \ + prev_votes.vote_map[n.idhex].measured_at) + + plog("INFO", "Average node measurement interval: "+str(node_measure_time/node_cnt)) + plog("INFO", "Average gaurd measurement interval: "+str(guard_measure_time/guard_cnt)) + + # There is a difference between measure period and sample rate. + # Measurement period is how fast the bandwidth auths can actually measure + # the network. Sample rate is how often we want the PID feedback loop to + # run. + NODE_SAMPLE_RATE = node_measure_time/node_cnt + tot_net_bw = 0 for n in nodes.itervalues(): n.fbw_ratio = n.filt_bw[n.chosen_fbw]/true_filt_avg n.sbw_ratio = n.strm_bw[n.chosen_sbw]/true_strm_avg - chosen_bw_idx = 0 if n.sbw_ratio > n.fbw_ratio: + # Does this ever happen? + plog("NOTICE", "sbw > fbw for "+n.nick) n.ratio = n.sbw_ratio - chosen_bw_idx = n.chosen_sbw + n.bw_idx = n.chosen_sbw + n.pid_error = (n.strm_bw[n.chosen_sbw] - true_strm_avg)/true_strm_avg else: n.ratio = n.fbw_ratio - chosen_bw_idx = n.chosen_fbw - - n.chosen_time = n.timestamps[chosen_bw_idx] - - if n.ratio < 1.0: - # XXX: Blend together BETA and GUARD_BETA for Guard+Exit nodes? - if GUARD_BETA > 0 and n.idhex in prev_consensus \ - and ("Guard" in prev_consensus[n.idhex].flags and not "Exit" in \ - prev_consensus[n.idhex].flags): - use_bw = GUARD_BETA*n.ns_bw[chosen_bw_idx] \ - + (1.0-GUARD_BETA)*n.desc_bw[chosen_bw_idx] - n.new_bw = use_bw*((1.0-GUARD_ALPHA) + GUARD_ALPHA*n.ratio) - elif BETA > 0: - use_bw = BETA*n.ns_bw[chosen_bw_idx] \ - + (1.0-BETA)*n.desc_bw[chosen_bw_idx] - n.new_bw = use_bw*((1.0-ALPHA) + ALPHA*n.ratio) + n.bw_idx = n.chosen_fbw + n.pid_error = (n.filt_bw[n.chosen_fbw] - true_filt_avg)/true_filt_avg + + n.chosen_time = n.timestamps[n.bw_idx] + + # XXX: What happens if we fall in and out of pid control due to ides + # uptime issues or whatever + if cs_junk.bwauth_pid_control: + if n.idhex in prev_votes.vote_map: + n.prev_error = prev_votes.vote_map[n.idhex].pid_error + n.prev_voted_at = prev_votes.vote_map[n.idhex].vote_time + # The integration here uses the measured values, not the vote/sample + # values. Therefore, it requires the measure timespans + n.pid_error_sum = prev_votes.vote_map[n.idhex].pid_error_sum + \ + n.pid_error*(n.chosen_time-prev_votes.vote_map[n.idhex].measured_at)/GUARD_SAMPLE_RATE + + # XXX: No reason to slow this down to NODE_SAMPLE_RATE... + if n.chosen_time - prev_votes.vote_map[n.idhex].vote_time > NODE_SAMPLE_RATE: + # Nodes with the Guard flag will respond + # slowly to feedback. It must be applied less often, + # and in proportion to the appropriate Wgx weight. + if "Guard" in prev_consensus[n.idhex].flags: + # Do full feedback if our previous vote > 2.5 weeks old + if n.idhex not in prev_votes.vote_map or \ + n.chosen_time - prev_votes.vote_map[n.idhex].vote_Time > GUARD_SAMPLE_RATE: + n.new_bw = n.pid_bw(GUARD_SAMPLE_RATE) + else: + # XXX: Update any of the n values based on this blend?? + guard_part = prev_votes.vote_map[n.idhex].bw # Use prev vote + if "Exit" in prev_consensus[n.idhex].flags: + n.new_bw = (1.0-cs_junk.bw_weights["Wgd"])*n.pid_bw(NODE_SAMPLE_RATE) + \ + cs_junk.bw_weights["Wgd"]*guard_part + else: + n.new_bw = (1.0-cs_junk.bw_weights["Wgg"])*n.pid_bw(NODE_SAMPLE_RATE) + \ + cs_junk.bw_weights["Wgg"]*guard_part + else: + # Everyone else should be pretty instantenous to respond. + # Full feedback should be fine for them (we hope) + n.new_bw = n.pid_bw(NODE_SAMPLE_RATE) else: - use_bw = n.desc_bw[chosen_bw_idx] - n.new_bw = use_bw*n.ratio - else: # Use ALPHA=0, BETA=0 for faster nodes. - use_bw = n.desc_bw[chosen_bw_idx] - n.new_bw = use_bw*n.ratio - n.change = n.new_bw - n.desc_bw[chosen_bw_idx] + # XXX: Reset any of the n values??? + if n.idhex in prev_votes.vote_map: + n.new_bw = prev_votes.vote_map[n.idhex].bw + n.vote_time = prev_votes.vote_map[n.idhex].vote_time + else: + # This should not happen. + plog("WARN", "No previous vote for recent node "+n.nick+"="+n.idhex) + n.new_bw = 0 + n.ignore = True + else: # No PID feedback + n.new_bw = n.desc_bw[n.bw_idx]*n.ratio + + n.change = n.new_bw - n.desc_bw[n.bw_idx] if n.idhex in prev_consensus: if prev_consensus[n.idhex].bandwidth != None: @@ -410,11 +511,15 @@ def main(argv): # Go through the list and cap them to NODE_CAP for n in nodes.itervalues(): + if n.new_bw >= 0xffffffff*1000: + plog("WARN", "Bandwidth of node "+n.nick+"="+n.idhex+" exceeded maxint32: "+str(n.new_bw)) + n.new_bw = 0xffffffff*1000 if n.new_bw > tot_net_bw*NODE_CAP: plog("INFO", "Clipping extremely fast node "+n.idhex+"="+n.nick+ " at "+str(100*NODE_CAP)+"% of network capacity (" +str(n.new_bw)+"->"+str(int(tot_net_bw*NODE_CAP))+")") n.new_bw = int(tot_net_bw*NODE_CAP) + n.pid_error_sum = 0 # Don't let unused error accumulate... # WTF is going on here? oldest_timestamp = min(map(lambda n: n.chosen_time, @@ -459,7 +564,7 @@ def main(argv): for n in n_print: if not n.ignore: - out.write("node_id="+n.idhex+" bw="+str(base10_round(n.new_bw))+" diff="+str(int(round(n.change/1000.0,0)))+ " nick="+n.nick+ " measured_at="+str(int(n.chosen_time))+"\n") + out.write("node_id="+n.idhex+" bw="+str(base10_round(n.new_bw))+" diff="+str(int(round(n.change/1000.0,0)))+ " nick="+n.nick+ " measured_at="+str(int(n.chosen_time))+" pid_error="+str(n.pid_error)+" pid_error_sum="+str(n.pid_error_sum)+" derror_dt="+str(n.derror_dt)+" vote_time="+str(n.vote_time)+"\n") out.close() if __name__ == "__main__":

1 0

[torflow/master] Update spec for PID control.
by mikeperry＠torproject.org 17 Nov '11

17 Nov '11

commit abe74257fb47402a167dcea22ae76429a541d317 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Oct 29 01:51:53 2011 -0700 Update spec for PID control. --- NetworkScanners/BwAuthority/README.spec.txt | 130 ++++++++++++++++++++++++--- 1 files changed, 116 insertions(+), 14 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index 8c638cd..ab67fd8 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -33,6 +33,9 @@ - Section 2 describes the periodically run step to aggregate results in order to include them in the network status voting process. + - Section 3 describes PID Control, an optional feedback mechanism + that is governed by the consensus parameter "bwauthpid". + The "interfaces" of this document are Tor's control and SOCKS protocol for performing measurements and Tor's directory protocol for including results in the network status voting process. @@ -290,11 +293,18 @@ slice timestamps for each router measurement, to ensure we use only the most recent slice that a router appeared in. + We then select the most recent measurement for each node from any + slice. + 2.2. Computing bandwidth values from measurements + If the consensus parameter "bwauthpid=1" is present, we proceed as + specified in Section 3. This section describes the default behavior + (used when the consensus parameter is absent). + Once we have determined the most recent measurements for each node, we compute an average of the filt_bw fields over all nodes we have measured. - + These averages are used to produce ratios for each node by dividing the measured value for that node by the network average. @@ -320,32 +330,124 @@ warning that is mailed to the scanner operator. We still produce a result file in this case. -2.4. Feedback mechanisms - -# BETA, GUARD_BETA, ALPHA, and GUARD_ALPHA are all set to 0 in the default -# configuration. Is the plan to change their values and use the more -# complex aggregation mechanism anytime soon? Or were they only in the -# code to run experiments and should go away? -KL - -# I am going to change how this stuff works for bug #1976. -MP. - -2.5. Result format +2.4. Result format The final output file for use by the directory authorities is comprised of lines of the following format: "node_id=" fingerprint SP "bw=" new_bandwidth SP - "diff=" (new bandwidth) - (descriptor bandwidth) SP "nick=" nickname SP "measured_at=" slice timestamp NL -2.6. Usage by directory authorities + If PID control is enabled, additional values are stored. See Section 3.4 + for those. + +2.5. Usage by directory authorities The Tor directory authorities use only the node_id and the bw fields. - The rest of the fields are informative only. + The rest of the fields are ignored. The directory authorities take the median of all votes for the bw field, and publish that value as the consensus bandwidth. +3. PID Control Feedback + + The goal of the bandwidth authorities is to balance load across the + network such that a user can expect to have the same average stream + capacity regardless of path. Any deviation from this ideal + load balancing can be regarded as error. + + Using this model, the measurement mechanisms can be cast as a PID + control system, allowing the new measurement ratios to multiplied by + the current consensus values, which creates a feedback loop that + should cause convergence to this balanced ideal. + + See https://en.wikipedia.org/wiki/PID_controller for background, + especially: https://en.wikipedia.org/wiki/PID_controller#Pseudocode + +3.1. Modeling Measurement as PID Control + + The bandwidth authorities measure F_node: the filtered stream + capacity through a given node (filtering is described in Section 1.6). + + The PID Setpoint, or target for each node is F_avg: the average filtered + stream capacity observed in the network + + The normalized PID error e(t) for each node is then: + + pid_error = e(t) = (F_node - F_avg)/F_avg. + + In the "Process" step, we take the output of the "controller" and multiply it by + the current consensus bandwidth for the node, and then add this new + proportion to the consensus bandwidth, thereby adjusting the + consensus bandwidth in proportion to the error: + + new_consensus_bw = old_consensus_bw + + old_consensus_bw * K_p * e(t) + + old_consensus_bw * K_i * \integral{e(t)} + + old_consensus_bw * K_d * \derivative{e(t)} + + For the case where K_p = 1, K_i=0, and K_d=0, it can be seen that this + system is equivalent to the one defined in 2.2, except using consensus + bandwidth instead of descriptor bandwidth: + + new_bw = old_bw + old_bw*e(t) + new_bw = old_bw + old_bw*(F_node/F_avg - 1) + new_bw = old_bw*F_node/F_avg + new_bw = old_bw*ratio + +3.2. Measurement intervals + + In order to prevent the consensus bandwidth from functioning as an + accumulator (thus amplifying the effects of integration), we must + carefully tune the measurement intervals to a rate that we can + expect clients to respond to. + + For non-Guard nodes, this is basically 4 consensus intervals, or 4 + hours. Since the bandwidth authorities also take on the order of + hours to measure a slice of nodes, we do nothing special here. + + For Guard nodes however, clients have an minimum rotation rate of 4-6 + weeks. However, on the assumption that they rotate more frequently + than this, we set our Guard measurement interval to 2 weeks. + + For purposes of calculating the integral and the derivative of the + error, we assume units of time that correspond to measurement intervals, + eliminating the need to track time for any other purpose other than + determining when to report a measurement. + + The integral component, pid_error_sum is subjected to a decay factor + of 20% per interval, to prevent unbounded growth in cases without + convergence. + + The differential component is a simple delta, calculating by + subtracting the previous pid_error from the current pid_error. + +3.3. Flag weighting + + Guard+Exit nodes are treated as normal nodes in terms of measurement + frequency (measurements are reported as soon as they are ready), except + they are given a K_p of 1.0-Wgd (Wgd is the consensus bandwidth-weight for + selecting Guard+Exits for the Guard position: See dir-spec.txt Section + 3.4.3). + +3.4. Value storage + + In order to maintain the PID information, we store the following additional + fields in the output file: + + "pid_error=" (PID error term as defined in Section 3.1) SP + "pid_error_sum=" (Weighted sum of PID error) SP + "pid_delta=" (Change in error) NL + + pid_delta is purely informational, and is not used in feedback. + +3.5. Tuning Parameters + + Internally, the source uses the Standard PID Form: + https://en.wikipedia.org/wiki/PID_controller#Ideal_versus_standard_PID_form + + We have selected T_i to be 5.0 (5 measurement intervals) and T_d to be 0.5 + (one half interval).

1 0

[torflow/master] Rename a debug field.
by mikeperry＠torproject.org 17 Nov '11

17 Nov '11

commit 7e79a3acd89b9c5e71d483460fd6ff2757e4fdfc Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Oct 29 18:16:27 2011 -0700 Rename a debug field. --- NetworkScanners/BwAuthority/aggregate.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index ef53c61..084693e 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -566,7 +566,7 @@ def main(argv): # FIXME: Split out debugging data for n in n_print: if not n.ignore: - out.write("node_id="+n.idhex+" bw="+str(base10_round(n.new_bw))+" nick="+n.nick+ " measured_at="+str(int(n.chosen_time))+" pid_error="+str(n.pid_error)+" pid_error_sum="+str(n.pid_error_sum)+" derror_dt="+str(n.derror_dt)+"\n") + out.write("node_id="+n.idhex+" bw="+str(base10_round(n.new_bw))+" nick="+n.nick+ " measured_at="+str(int(n.chosen_time))+" pid_error="+str(n.pid_error)+" pid_error_sum="+str(n.pid_error_sum)+" pid_delta="+str(n.derror_dt)+"\n") out.close() if __name__ == "__main__":

1 0

[torflow/master] Refactor and remove dead/useless code.
by mikeperry＠torproject.org 17 Nov '11

17 Nov '11

commit efe46c117daaeeb484948d963733b129489aaea3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Oct 29 01:52:07 2011 -0700 Refactor and remove dead/useless code. Document some future concerns. --- NetworkScanners/BwAuthority/aggregate.py | 144 +++++++++++++++--------------- 1 files changed, 73 insertions(+), 71 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 1462f9b..ef53c61 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -28,12 +28,13 @@ GUARD_SAMPLE_RATE = 2*7*24*60*60 # 2wks # See https://en.wikipedia.org/wiki/PID_controller#Ideal_versus_standard_PID_form K_p = 1.0 -# We expect to correct steady state error in 4 samples -T_i = 4 +# We expect to correct steady state error in 5 samples (guess) +T_i = 5.0 # We can only expect to predict less than one sample into the future, as # after 1 sample, clients will have migrated -# FIXME: This is a function of the consensus time.. +# FIXME: Our prediction ability is a function of the consensus time +# vs measurement rate T_d = 0.5 K_i = K_p/T_i @@ -100,7 +101,7 @@ class Node: self.fbw_ratio = None self.pid_error = 0 self.prev_error = 0 - self.prev_voted_at = 0 + self.prev_measured_at = 0 self.pid_error_sum = 0 self.derror_dt = 0 self.ratio = None @@ -113,26 +114,36 @@ class Node: self.desc_bw = [] self.timestamps = [] + def revert_to_vote(self, vote): + self.new_bw = vote.bw + self.pid_error = vote.pid_error + self.chosen_time = vote.measured_at + # Derivative of error for pid control - def pid_bw(self, bw_idx, dt): - return self.ns_bw[bw_idx] \ - + K_p*self.ns_bw[bw_idx]*self.pid_error \ - + K_i*self.ns_bw[bw_idx]*self.integral_error(dt) \ - + K_d*self.ns_bw[bw_idx]*self.d_error_dt(dt) - - # Time-weighted sum of error per unit of time, scaled - # to arbitrary units of 'dt' seconds - def integral_error(self, dt): - return (self.pid_error_sum * GUARD_SAMPLE_RATE) / dt - - # Rate of error per unit of time, scaled to arbitrary - # units of 'dt' seconds - def d_error_dt(self, dt): - if self.prev_voted_at == 0 or self.prev_error == 0: + def pid_bw(self, prev_vote, kp): + self.prev_error = prev_vote.pid_error + self.prev_measured_at = prev_vote.measured_at + # We decay the interval by 1/T_i each round to keep it bounded. + # This is non-standard + self.pid_error_sum = prev_vote.pid_error_sum*(1 - 1.0/T_i) + self.pid_error + + return self.ns_bw[self.bw_idx] \ + + kp*(self.ns_bw[self.bw_idx]*self.pid_error \ + + self.ns_bw[self.bw_idx]*self.integral_error()/T_i \ + + self.ns_bw[self.bw_idx]*self.d_error_dt()*T_d) + + # Time-weighted sum of error per unit of time (measurement sample) + def integral_error(self): + if self.prev_error == 0: + return 0 + return self.pid_error_sum + + # Rate of change in error from the last measurement sample + def d_error_dt(self): + if self.prev_measured_at == 0 or self.prev_error == 0: self.derror_dt = 0 else: - self.derror_dt = ((dt*self.pid_error - dt*self.prev_error) / \ - (self.chosen_time - self.prev_voted_at)) + self.derror_dt = self.pid_error - self.prev_error return self.derror_dt def add_line(self, line): @@ -144,7 +155,7 @@ class Node: or self.node_data[line.slice_file].timestamp < line.timestamp: self.node_data[line.slice_file] = NodeData(line.timestamp) - # FIXME: This is kinda nutty. Can we simplify? For instance, + # TODO: This is kinda nutty. Can we simplify? For instance, # do these really need to be lists inside the nd? nd = self.node_data[line.slice_file] nd.strm_bw.append(line.strm_bw) @@ -230,12 +241,10 @@ class Vote: try: self.pid_error = float(re.search("[\s]*pid_error=([\S]+)[\s]*", line).group(1)) self.pid_error_sum = float(re.search("[\s]*pid_error_sum=([\S]+)[\s]*", line).group(1)) - self.vote_time = int(re.search("[\s]*vote_time=([\S]+)[\s]*", line).group(1)) except: plog("NOTICE", "No previous PID data.") self.pid_error = 0 self.pid_error_sum = 0 - self.vote_time = 0 class VoteSet: def __init__(self, filename): @@ -299,7 +308,7 @@ def main(argv): cs_junk = ConsensusJunk(c) - # FIXME: This is poor form.. We should subclass the Networkstatus class + # TODO: This is poor form.. We should subclass the Networkstatus class # instead of just adding members for i in xrange(max_rank): n = ns_list[i] @@ -421,14 +430,12 @@ def main(argv): node_measure_time += (n.timestamps[n.chosen_fbw] - \ prev_votes.vote_map[n.idhex].measured_at) - plog("INFO", "Average node measurement interval: "+str(node_measure_time/node_cnt)) - plog("INFO", "Average gaurd measurement interval: "+str(guard_measure_time/guard_cnt)) - # There is a difference between measure period and sample rate. # Measurement period is how fast the bandwidth auths can actually measure # the network. Sample rate is how often we want the PID feedback loop to # run. - NODE_SAMPLE_RATE = node_measure_time/node_cnt + plog("INFO", "Average node measurement interval: "+str(node_measure_time/node_cnt)) + plog("INFO", "Average gaurd measurement interval: "+str(guard_measure_time/guard_cnt)) tot_net_bw = 0 for n in nodes.itervalues(): @@ -447,51 +454,46 @@ def main(argv): n.chosen_time = n.timestamps[n.bw_idx] - # XXX: What happens if we fall in and out of pid control due to ides - # uptime issues or whatever if cs_junk.bwauth_pid_control: if n.idhex in prev_votes.vote_map: - n.prev_error = prev_votes.vote_map[n.idhex].pid_error - n.prev_voted_at = prev_votes.vote_map[n.idhex].vote_time - # The integration here uses the measured values, not the vote/sample - # values. Therefore, it requires the measure timespans - n.pid_error_sum = prev_votes.vote_map[n.idhex].pid_error_sum + \ - n.pid_error*(n.chosen_time-prev_votes.vote_map[n.idhex].measured_at)/GUARD_SAMPLE_RATE - - # XXX: No reason to slow this down to NODE_SAMPLE_RATE... - if n.chosen_time - prev_votes.vote_map[n.idhex].vote_time > NODE_SAMPLE_RATE: - # Nodes with the Guard flag will respond - # slowly to feedback. It must be applied less often, - # and in proportion to the appropriate Wgx weight. - if "Guard" in prev_consensus[n.idhex].flags: - # Do full feedback if our previous vote > 2.5 weeks old - if n.idhex not in prev_votes.vote_map or \ - n.chosen_time - prev_votes.vote_map[n.idhex].vote_Time > GUARD_SAMPLE_RATE: - n.new_bw = n.pid_bw(GUARD_SAMPLE_RATE) + # If there is a new sample, let's use it for all but guards + if n.chosen_time > prev_votes.vote_map[n.idhex].measured_at: + # Nodes with the Guard flag will respond slowly to feedback, + # so they should be sampled less often, and in proportion to + # the appropriate Wgx weight. + if n.idhex in prev_consensus and \ + ("Guard" in prev_consensus[n.idhex].flags \ + and "Exit" not in prev_consensus[n.idhex].flags): + # Do full feedback if our previous vote > 2.5 weeks old + if n.idhex not in prev_votes.vote_map or \ + n.chosen_time - prev_votes.vote_map[n.idhex].measured_at > GUARD_SAMPLE_RATE: + n.new_bw = n.pid_bw(prev_votes.vote_map[n.idhex], K_p) + else: + n.revert_to_vote(prev_votes.vote_map[n.idhex]) else: - # XXX: Update any of the n values based on this blend?? - guard_part = prev_votes.vote_map[n.idhex].bw # Use prev vote - if "Exit" in prev_consensus[n.idhex].flags: - n.new_bw = (1.0-cs_junk.bw_weights["Wgd"])*n.pid_bw(NODE_SAMPLE_RATE) + \ - cs_junk.bw_weights["Wgd"]*guard_part + # Everyone else should be pretty instantenous to respond. + # Full feedback should be fine for them (we hope), + # except for Guard+Exits, we want to dampen just a little + # bit for them. Wgd seems a good choice, but might not be exact. + # We really want to magically combine Wgd and something that + # represents the client migration rate for Guards.. But who + # knows how to represent that and still KISS? + if n.idhex in prev_consensus and \ + ("Guard" in prev_consensus[n.idhex].flags \ + and "Exit" not in prev_consensus[n.idhex].flags): + n.new_bw = n.pid_bw(prev_votes.vote_map[n.idhex], 1.0-cs_junk.bw_weights["Wgd"]) else: - n.new_bw = (1.0-cs_junk.bw_weights["Wgg"])*n.pid_bw(NODE_SAMPLE_RATE) + \ - cs_junk.bw_weights["Wgg"]*guard_part - else: - # Everyone else should be pretty instantenous to respond. - # Full feedback should be fine for them (we hope) - n.new_bw = n.pid_bw(NODE_SAMPLE_RATE) - else: - # XXX: Reset any of the n values??? - if n.idhex in prev_votes.vote_map: - n.new_bw = prev_votes.vote_map[n.idhex].bw - n.vote_time = prev_votes.vote_map[n.idhex].vote_time + n.new_bw = n.pid_bw(prev_votes.vote_map[n.idhex], K_p) else: - # This should not happen. - plog("WARN", "No previous vote for recent node "+n.nick+"="+n.idhex) - n.new_bw = 0 - n.ignore = True + # Reset values. Don't vote/sample this measurement round. + n.revert_to_vote(prev_votes.vote_map[n.idhex]) + else: # No prev vote, pure consensus feedback this round + n.new_bw = n.ns_bw[n.bw_idx] + K_p*n.ns_bw[n.bw_idx]*n.pid_error + n.pid_error_sum = n.pid_error + plog("INFO", "No prev vote for node "+n.nick+": Consensus feedback") else: # No PID feedback + n.pid_error = 0 + n.pid_error_sum = 0 n.new_bw = n.desc_bw[n.bw_idx]*n.ratio n.change = n.new_bw - n.desc_bw[n.bw_idx] @@ -561,12 +563,12 @@ def main(argv): out = file(argv[-1], "w") out.write(str(scan_age)+"\n") - + # FIXME: Split out debugging data for n in n_print: if not n.ignore: - out.write("node_id="+n.idhex+" bw="+str(base10_round(n.new_bw))+" diff="+str(int(round(n.change/1000.0,0)))+ " nick="+n.nick+ " measured_at="+str(int(n.chosen_time))+" pid_error="+str(n.pid_error)+" pid_error_sum="+str(n.pid_error_sum)+" derror_dt="+str(n.derror_dt)+" vote_time="+str(n.vote_time)+"\n") + out.write("node_id="+n.idhex+" bw="+str(base10_round(n.new_bw))+" nick="+n.nick+ " measured_at="+str(int(n.chosen_time))+" pid_error="+str(n.pid_error)+" pid_error_sum="+str(n.pid_error_sum)+" derror_dt="+str(n.derror_dt)+"\n") out.close() - + if __name__ == "__main__": try: main(sys.argv)

1 0