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

[torspec/master] Clarify QuotedString and what needs to get escaped in it
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 9716716527fc5e8047b57f14870afbb3c864a197 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:56:09 2012 -0500 Clarify QuotedString and what needs to get escaped in it --- control-spec.txt | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index febe9e9..50ffc9e 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -97,10 +97,12 @@ We define the following general-use nonterminals: - String = DQUOTE *qcontent DQUOTE + QuotedString = DQUOTE *qcontent DQUOTE - There are explicitly no limits on line length. All 8-bit characters are - permitted unless explicitly disallowed. + There are explicitly no limits on line length. All 8-bit characters + are permitted unless explicitly disallowed. In QuotedStrings, + backslashes and quotes must be escaped; other characters need not be + escaped. Wherever CRLF is specified to be accepted from the controller, Tor MAY also accept LF. Tor, however, MUST NOT generate LF instead of CRLF.

1 0

[torspec/master] Document AUTHDIR_NEWDESCS better
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit a1331ca69dc768709b53b104b243fca27320ae74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:45:11 2012 -0500 Document AUTHDIR_NEWDESCS better --- control-spec.txt | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 1cf7535..febe9e9 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1574,12 +1574,23 @@ 4.1.8. Descriptors uploaded to us in our role as authoritative dirserver + Tor generates this event when it's an directory authority, and + somebody has just uploaded a router descriptor. + Syntax: "650" "+" "AUTHDIR_NEWDESCS" CRLF Action CRLF Message CRLF Descriptor CRLF "." CRLF "650" SP "OK" CRLF Action = "ACCEPTED" / "DROPPED" / "REJECTED" Message = Text + The Descriptor field is the text of the router descriptor; the Action + field is "ACCEPTED" if we're accepting the descriptor as the new + best valid descriptor for its router, "REJECTED" if we aren't taking + the descriptor and we're complaining to the uploading relay about + it, and "DROPPED" if we decide to drop the descriptor without + complaining. The Message field is a human-readable string + explaining why we chose the Action. (It doesn't contain newlines.) + 4.1.9. Our descriptor changed Syntax:

1 0

[torspec/master] Oops; add another thing that triggers ADDRMAP
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 93574d1bcabb5d05ca0dcec4f1f3204c091d2673 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:40:04 2012 -0500 Oops; add another thing that triggers ADDRMAP --- control-spec.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index b6ae495..1cf7535 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1550,7 +1550,8 @@ Tor's address map cache, or when the answer for a RESOLVE command is found. Entries can be created by a successful or failed DNS lookup, a successful or failed connection attempt, a RESOLVE command, - a MAPADDRESS command, or the AutomapHostsOnResolve feature. + a MAPADDRESS command, the AutomapHostsOnResolve feature, or the + TrackHostExits feature. Syntax: "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry

1 0

[torspec/master] Improve documentation for ADDRMAP controller events
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 12ce6bf77d5ab104598c032749f61188573b006d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:38:44 2012 -0500 Improve documentation for ADDRMAP controller events based on a patch from atagar and comments by rransom. Fixes 7515. --- control-spec.txt | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index cc82dca..b6ae495 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1546,26 +1546,31 @@ 4.1.7. New Address mapping + These events are generated when a new address mapping is entered in + Tor's address map cache, or when the answer for a RESOLVE command is + found. Entries can be created by a successful or failed DNS lookup, + a successful or failed connection attempt, a RESOLVE command, + a MAPADDRESS command, or the AutomapHostsOnResolve feature. + Syntax: "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry - [SP Error] [SP UTCExpiry] CRLF + [SP "error=" ErrorCode] [SP "EXPIRES=" UTCExpiry] CRLF NewAddress = Address / "<error>" Expiry = DQUOTE ISOTime DQUOTE / "NEVER" - Error = "error=" ErrorCode - ErrorCode = XXXX - UTCExpiry = "EXPIRES=" DQUOTE IsoTime DQUOTE + ErrorCode = "yes" / "internal" / "Unable to launch resolve request" + UTCExpiry = DQUOTE IsoTime DQUOTE Error and UTCExpiry are only provided if extended events are enabled. + The values for Error are mostly useless. Future values will be + chosen to match 1*(ALNUM / "_"); the "Unable to launch resolve request" + value is a bug in Tor before 0.2.4.7-alpha. Expiry is expressed as the local time (rather than UTC). This is a bug, left in for backward compatibility; new code should look at UTCExpiry instead. (If Expiry is "NEVER", UTCExpiry is omitted.) - These events are generated when a new address mapping is entered in the - cache, or when the answer for a RESOLVE command is found. - 4.1.8. Descriptors uploaded to us in our role as authoritative dirserver Syntax:

1 0

[tor/master] Make sure that the error in ADDRMAP events is well-formed
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 267c0e5aa14deeb2ca0d7997b4ef5a5c2bbf5fd4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:36:44 2012 -0500 Make sure that the error in ADDRMAP events is well-formed "error=Unable to launch resolve request" is not a nice thing to tell the controller. Bugfix on 0.2.0.19-alpha (c11c48fc). --- changes/addrmap_error | 5 +++++ src/or/control.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/addrmap_error b/changes/addrmap_error new file mode 100644 index 0000000..17d9b54 --- /dev/null +++ b/changes/addrmap_error @@ -0,0 +1,5 @@ + o Minor bugfixes (controller): + - The ADDRMAP command can no longer generate an ill-formed error + code on a failed MAPADDRESS. It now says "internal" rather than + an English sentence fragment with spaces in the middle. Bugfix on + Tor 0.2.0.19-alpha. diff --git a/src/or/control.c b/src/or/control.c index c6a66ae..0b7f04a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2943,7 +2943,7 @@ handle_control_resolve(control_connection_t *conn, uint32_t len, send_control_done(conn); SMARTLIST_FOREACH(failed, const char *, arg, { control_event_address_mapped(arg, arg, time(NULL), - "Unable to launch resolve request"); + "internal"); }); SMARTLIST_FOREACH(args, char *, cp, tor_free(cp));

1 0

[torspec/master] Make the forward-compatibility sec of control-spec more bulletproof
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 4745fc3dbaf8253e96bf2a543d0140a60e6dba50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:27:46 2012 -0500 Make the forward-compatibility sec of control-spec more bulletproof --- control-spec.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 43212a5..cc82dca 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -81,6 +81,11 @@ a stream closed for an unrecognized reason is nevertheless closed, and should be reported as such. + (If some list of alternatives is given, and there isn't an explicit + statement that clients must tolerate unexpected values, clients still + must tolerate unexpected values. The only exception would be if there + were an explicit statement that no future values will ever be added.) + 2. Message format 2.1. Description format

1 0

[torspec/master] Note that UTCExpiry is omitted when Expiry is Never
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 901659e21373c87815d8808527b21e002fb662fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:24:09 2012 -0500 Note that UTCExpiry is omitted when Expiry is Never This corrects the format of addrmap events. Fix for 6829 --- control-spec.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 378fbbf..43212a5 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1543,7 +1543,7 @@ Syntax: "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry - [SP Error] SP UTCExpiry CRLF + [SP Error] [SP UTCExpiry] CRLF NewAddress = Address / "<error>" Expiry = DQUOTE ISOTime DQUOTE / "NEVER" @@ -1556,7 +1556,7 @@ Expiry is expressed as the local time (rather than UTC). This is a bug, left in for backward compatibility; new code should look at UTCExpiry - instead. + instead. (If Expiry is "NEVER", UTCExpiry is omitted.) These events are generated when a new address mapping is entered in the cache, or when the answer for a RESOLVE command is found.

1 0

[torspec/master] Try to document Reason and Status for ORCONN events
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 036e2564919b667b1f9efff1d0514d85e470d0c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 11:18:38 2012 -0500 Try to document Reason and Status for ORCONN events Should fix ticket 7513 --- control-spec.txt | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 5574110..378fbbf 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1479,6 +1479,35 @@ NumCircuits counts both established and pending circuits. + The ORStatus values are as follows: + NEW -- We have received a new incoming OR connection, and are starting + the server-side handshake. + LAUNCHED -- We have launched a new outgoing OR connection, and are + starting the client-side handshake. + CONNECTED -- The OR connection has been connected and the handshake is + done. + FAILED -- Our attempt to open the OR connection failed. + CLOSED -- The OR connection closed in an unremarkable way. + + The Reason values for closed/failed OR connections are: + DONE -- The OR connection has shut down cleanly. + CONNECTREFUSED -- We got an ECONNREFUSED while connecting to the target + OR. + IDENTITY -- We connected to the OR, but found that its identity was + not what we expected. + CONNECTRESET -- We got an ECONNRESET or similar IO error from the + connection with the OR. + TIMEOUT -- We got an ETIMEOUT or similar IO error from the connection + with the OR, or we're closing the connection for being idle for too + long. + NOROUTE -- We got an ENOTCONN, ENETUNREACH, ENETDOWN, EHOSTUNREACH, or + similar error while connecting to the OR. + IOERROR -- We got some other IO error on our connection to the OR. + RESOURCELIMIT -- We don't have enough operating system resources (file + descriptors, buffers, etc) to connect to the OR. + MISC -- The OR connection closed for some other reason. + + 4.1.4. Bandwidth used in the last second The syntax is:

1 0

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

23 Nov '12

commit f32eb1ebd3be14d93552c8a947ef24fc7cb73981 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 23 16:15:19 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 547c22b..62330c5 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-23 15:45+0000\n" +"PO-Revision-Date: 2012-11-23 15:50+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" @@ -3666,11 +3666,11 @@ msgstr "Finalizado con éxito" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" -msgstr "No se encontraron dispositivos con UPnP activo" +msgstr "No se encontraron dispositivos con UPnP activado" msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" -msgstr "No se encontraron dispositivos válidos de salida a Internet (gateway) con UPnP activo" +msgstr "No se encontraron dispositivos válidos de salida a Internet (gateway) con UPnP activado" msgctxt "UPNPControl" msgid "WSAStartup failed" @@ -3678,15 +3678,15 @@ msgstr "WSAStartup falló (acceso de la aplicación a protocolos de red en Windo msgctxt "UPNPControl" msgid "Failed to add a port mapping" -msgstr "Fallo al agregar un mapeado de puertos" +msgstr "Fallo al agregar un puerto al mapeado" msgctxt "UPNPControl" msgid "Failed to retrieve a port mapping" -msgstr "Fallo al recuperar un mapeado de puertos" +msgstr "Fallo al recuperar un puerto del mapeado" msgctxt "UPNPControl" msgid "Failed to remove a port mapping" -msgstr "Fallo al eliminar un mapeado de puertos" +msgstr "Fallo al eliminar un puerto del mapeado" msgctxt "UPNPControl" msgid "Unknown error" @@ -3694,15 +3694,15 @@ msgstr "Error desconocido" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" -msgstr "Buscando dispositivos UpnP habilitados" +msgstr "Buscando dispositivos con UPnP activado" msgctxt "UPNPTestDialog" msgid "Updating directory port mapping" -msgstr "Actualizando el directorio de mapeo de puertos" +msgstr "Actualizando el mapeado de puertos de la lista de propagación (directory)" msgctxt "UPNPTestDialog" msgid "Updating relay port mapping" -msgstr "Actualizando el mapeo de puertos del repetidor" +msgstr "Actualizando el mapeado de puertos del repetidor" msgctxt "UPNPTestDialog" msgid "Test completed successfully!"

1 0

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

23 Nov '12

commit bf5e19378b9f6f2fa4dd1d97dae0888447e8b22f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 23 16:15:17 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 547c22b..62330c5 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-23 15:45+0000\n" +"PO-Revision-Date: 2012-11-23 15:50+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" @@ -3666,11 +3666,11 @@ msgstr "Finalizado con éxito" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" -msgstr "No se encontraron dispositivos con UPnP activo" +msgstr "No se encontraron dispositivos con UPnP activado" msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" -msgstr "No se encontraron dispositivos válidos de salida a Internet (gateway) con UPnP activo" +msgstr "No se encontraron dispositivos válidos de salida a Internet (gateway) con UPnP activado" msgctxt "UPNPControl" msgid "WSAStartup failed" @@ -3678,15 +3678,15 @@ msgstr "WSAStartup falló (acceso de la aplicación a protocolos de red en Windo msgctxt "UPNPControl" msgid "Failed to add a port mapping" -msgstr "Fallo al agregar un mapeado de puertos" +msgstr "Fallo al agregar un puerto al mapeado" msgctxt "UPNPControl" msgid "Failed to retrieve a port mapping" -msgstr "Fallo al recuperar un mapeado de puertos" +msgstr "Fallo al recuperar un puerto del mapeado" msgctxt "UPNPControl" msgid "Failed to remove a port mapping" -msgstr "Fallo al eliminar un mapeado de puertos" +msgstr "Fallo al eliminar un puerto del mapeado" msgctxt "UPNPControl" msgid "Unknown error" @@ -3694,15 +3694,15 @@ msgstr "Error desconocido" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" -msgstr "Buscando dispositivos UpnP habilitados" +msgstr "Buscando dispositivos con UPnP activado" msgctxt "UPNPTestDialog" msgid "Updating directory port mapping" -msgstr "Actualizando el directorio de mapeo de puertos" +msgstr "Actualizando el mapeado de puertos de la lista de propagación (directory)" msgctxt "UPNPTestDialog" msgid "Updating relay port mapping" -msgstr "Actualizando el mapeo de puertos del repetidor" +msgstr "Actualizando el mapeado de puertos del repetidor" msgctxt "UPNPTestDialog" msgid "Test completed successfully!"

1 0