April 2013 - tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 05 Apr '13

05 Apr '13

commit 8547731c3bfaba9d3960843191443fe58ce4f52a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 5 21:15:35 2013 +0000 Update translations for vidalia_help --- ar/services.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/services.po b/ar/services.po index 32634e2..e9e827a 100644 --- a/ar/services.po +++ b/ar/services.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-04 21:46+0000\n" +"PO-Revision-Date: 2013-04-05 21:06+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -236,7 +236,7 @@ msgstr "<a name=\"client\"/>" #. type: Content of: <html><body><h3> #: en/services.html:136 msgid "How does Vidalia help me to access other hidden services?" -msgstr "كيف يستطيع فيداليا مساعدتي للوصول الى خدمات خفية أخرى؟" +msgstr "كيف يستطيع ڤيداليا مساعدتي علي الوصول لخدمات خفية أخرى؟" #. type: Content of: <html><body> #: en/services.html:138 @@ -245,4 +245,4 @@ msgid "" "service, type the service's onion address in your browser (or appropriate " "client application if it's not a web service), and Tor does the rest for " "you. There is no need to specifically configure Tor for that." -msgstr "بدون مانع على الإطلاق, ليست هناك حاجة للقيام بذلك. إذا كنت تريد الوصول إلى خدمة خفية أخرى, اكتب عنوان اونيون للخدمة في المتصفّح الخاص بك (أو تطبيق العميل المناسب إذا لم تكن خدمة ويب), ويقوم تور بالبقية عنك. ليست هناك حاجة لتكوين تور على وجه التحديد لذلك. " +msgstr "لا على الإطلاق, ليست هناك حاجة للقيام بذلك. إذا كنت تريد الوصول إلى خدمة خفية أخرى, اكتب عنوان اونيون للخدمة في المتصفّح الخاص بك (أو تطبيق العميل المناسب إذا لم تكن خدمة ويب), ويقوم تور بالبقية بالنيابة عنك. ليست هناك حاجة لتكوين تور على وجه التحديد لذلك. "

1 0

[torspec/master] contol-spec: Add "CACHED" keyword to ADDRMAP events (#8596)
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit 25b0d43a9ebe89541625e9f1a090e4a701748c76 Author: Desoxy <desoxy(a)fastmail.fm> Date: Wed Apr 3 19:22:51 2013 +0200 contol-spec: Add "CACHED" keyword to ADDRMAP events (#8596) --- control-spec.txt | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 0219542..4498fbe 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1579,7 +1579,8 @@ Syntax: "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry - [SP "error=" ErrorCode] [SP "EXPIRES=" UTCExpiry] CRLF + [SP "error=" ErrorCode] [SP "EXPIRES=" UTCExpiry] [SP "CACHED=" Cached] + CRLF NewAddress = Address / "<error>" Expiry = DQUOTE ISOTime DQUOTE / "NEVER" @@ -1587,6 +1588,8 @@ ErrorCode = "yes" / "internal" / "Unable to launch resolve request" UTCExpiry = DQUOTE IsoTime DQUOTE + Cached = "YES" / "NO" + 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" @@ -1596,6 +1599,9 @@ left in for backward compatibility; new code should look at UTCExpiry instead. (If Expiry is "NEVER", UTCExpiry is omitted.) + Cached indicates whether the mapping will be stored until it expires, or if + it is just a notification in response to a RESOLVE command. + 4.1.8. Descriptors uploaded to us in our role as authoritative dirserver Tor generates this event when it's an directory authority, and

1 0

[tor/master] Controller: Add CACHED keyword to ADDRMAP events (#8596 part 2/2)
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit 74f5e304e49b8ccde2b97232c49e5025dba21f59 Author: Desoxy <desoxy(a)fastmail.fm> Date: Wed Apr 3 18:50:51 2013 +0200 Controller: Add CACHED keyword to ADDRMAP events (#8596 part 2/2) Add keyword CACHED="YES"/"NO" to ADDRMAP control events to indicate whether the DNS response will be cached or not. --- changes/bug8596 | 3 +++ src/or/addressmap.c | 2 +- src/or/connection_edge.c | 9 ++++----- src/or/control.c | 14 ++++++++------ src/or/control.h | 3 ++- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/changes/bug8596 b/changes/bug8596 new file mode 100644 index 0000000..dd36bad --- /dev/null +++ b/changes/bug8596 @@ -0,0 +1,3 @@ + o Minor features: + - Add CACHED keyword to ADDRMAP events in the control protocol to indicate + whether a DNS result will be cached or not. diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 826eb30..79e4b7c 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -560,7 +560,7 @@ addressmap_register(const char *address, char *new_address, time_t expires, log_info(LD_CONFIG, "Addressmap: (re)mapped '%s' to '%s'", safe_str_client(address), safe_str_client(ent->new_address)); - control_event_address_mapped(address, ent->new_address, expires, NULL); + control_event_address_mapped(address, ent->new_address, expires, NULL, 1); } /** An attempt to resolve address failed at some OR. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 0519708..926fcab 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2044,18 +2044,17 @@ tell_controller_about_resolved_result(entry_connection_t *conn, if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer))); control_event_address_mapped(conn->socks_request->address, - cp, expires, NULL); + cp, expires, NULL, 0); tor_free(cp); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256) { char *cp = tor_strndup(answer, answer_len); control_event_address_mapped(conn->socks_request->address, - cp, expires, NULL); + cp, expires, NULL, 0); tor_free(cp); } else { control_event_address_mapped(conn->socks_request->address, - "<error>", - time(NULL)+ttl, - "error=yes"); + "<error>", time(NULL)+ttl, + "error=yes", 0); } } diff --git a/src/or/control.c b/src/or/control.c index 2a68464..f50b877 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2947,7 +2947,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), - "internal"); + "internal", 0); }); SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); @@ -4024,15 +4024,17 @@ control_event_descriptors_changed(smartlist_t *routers) */ int control_event_address_mapped(const char *from, const char *to, time_t expires, - const char *error) + const char *error, const int cached) { if (!EVENT_IS_INTERESTING(EVENT_ADDRMAP)) return 0; if (expires < 3 || expires == TIME_MAX) send_control_event(EVENT_ADDRMAP, ALL_FORMATS, - "650 ADDRMAP %s %s NEVER %s\r\n", from, to, - error?error:""); + "650 ADDRMAP %s %s NEVER %s%s" + "CACHED=\"%s\"\r\n", + from, to, error?error:"", error?" ":"", + cached?"YES":"NO"); else { char buf[ISO_TIME_LEN+1]; char buf2[ISO_TIME_LEN+1]; @@ -4040,10 +4042,10 @@ control_event_address_mapped(const char *from, const char *to, time_t expires, format_iso_time(buf2,expires); send_control_event(EVENT_ADDRMAP, ALL_FORMATS, "650 ADDRMAP %s %s \"%s\"" - " %s%sEXPIRES=\"%s\"\r\n", + " %s%sEXPIRES=\"%s\" CACHED=\"%s\"\r\n", from, to, buf, error?error:"", error?" ":"", - buf2); + buf2, cached?"YES":"NO"); } return 0; diff --git a/src/or/control.h b/src/or/control.h index 51ae230..0ea7941 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -53,7 +53,8 @@ int control_event_stream_bandwidth_used(void); void control_event_logmsg(int severity, uint32_t domain, const char *msg); int control_event_descriptors_changed(smartlist_t *routers); int control_event_address_mapped(const char *from, const char *to, - time_t expires, const char *error); + time_t expires, const char *error, + const int cached); int control_event_or_authdir_new_descriptor(const char *action, const char *desc, size_t desclen,

1 0

[tor/master] Controller: Always send ADDRMAP event after RESOLVE command (#8596 part 1/2)
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit 2c40138210fe934f687470fc4bd20513982bf424 Author: Desoxy <desoxy(a)fastmail.fm> Date: Wed Apr 3 18:50:27 2013 +0200 Controller: Always send ADDRMAP event after RESOLVE command (#8596 part 1/2) Since 7536c40 only DNS results for real SOCKS requests are added to the cache, but not DNS results for DNSPort queries or control connection RESOLVE queries. Only cache additions would trigger ADDRMAP events on successful resolve. Change it so that DNS results received after a RESOLVE command also generate ADDRMAP events. --- src/or/connection_edge.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 5075c47..0519708 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2040,11 +2040,8 @@ tell_controller_about_resolved_result(entry_connection_t *conn, int ttl, time_t expires) { - - if (ttl >= 0 && (answer_type == RESOLVED_TYPE_IPV4 || - answer_type == RESOLVED_TYPE_HOSTNAME)) { - return; /* we already told the controller. */ - } else if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { + expires = time(NULL) + ttl; + if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer))); control_event_address_mapped(conn->socks_request->address, cp, expires, NULL); @@ -2116,8 +2113,9 @@ connection_ap_handshake_socks_resolved(entry_connection_t *conn, conn->socks_request->has_finished = 1; return; } else { - /* This must be a request from the controller. We already sent - * a mapaddress if there's a ttl. */ + /* This must be a request from the controller. Since answers to those + * requests are not cached, they do not generate an ADDRMAP event on + * their own. */ tell_controller_about_resolved_result(conn, answer_type, answer_len, (char*)answer, ttl, expires); conn->socks_request->has_finished = 1;

1 0

[tor/master] Merge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit 3367a7611eb2a4fbedca568e39045971106cb315 Merge: d1dc23c 74f5e30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 5 16:57:53 2013 -0400 Merge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4 changes/bug8596 | 3 +++ src/or/addressmap.c | 2 +- src/or/connection_edge.c | 21 +++++++++------------ src/or/control.c | 14 ++++++++------ src/or/control.h | 3 ++- 5 files changed, 23 insertions(+), 20 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit 25f9ecf4b203ed6a524b1d78ff2e38a2d0583d88 Merge: 55817c4 3367a76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 5 16:58:26 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8596 | 3 +++ src/or/addressmap.c | 2 +- src/or/connection_edge.c | 21 +++++++++------------ src/or/control.c | 14 ++++++++------ src/or/control.h | 3 ++- 5 files changed, 23 insertions(+), 20 deletions(-)

1 0

[tor/maint-0.2.4] Controller: Always send ADDRMAP event after RESOLVE command (#8596 part 1/2)
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit 2c40138210fe934f687470fc4bd20513982bf424 Author: Desoxy <desoxy(a)fastmail.fm> Date: Wed Apr 3 18:50:27 2013 +0200 Controller: Always send ADDRMAP event after RESOLVE command (#8596 part 1/2) Since 7536c40 only DNS results for real SOCKS requests are added to the cache, but not DNS results for DNSPort queries or control connection RESOLVE queries. Only cache additions would trigger ADDRMAP events on successful resolve. Change it so that DNS results received after a RESOLVE command also generate ADDRMAP events. --- src/or/connection_edge.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 5075c47..0519708 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2040,11 +2040,8 @@ tell_controller_about_resolved_result(entry_connection_t *conn, int ttl, time_t expires) { - - if (ttl >= 0 && (answer_type == RESOLVED_TYPE_IPV4 || - answer_type == RESOLVED_TYPE_HOSTNAME)) { - return; /* we already told the controller. */ - } else if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { + expires = time(NULL) + ttl; + if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer))); control_event_address_mapped(conn->socks_request->address, cp, expires, NULL); @@ -2116,8 +2113,9 @@ connection_ap_handshake_socks_resolved(entry_connection_t *conn, conn->socks_request->has_finished = 1; return; } else { - /* This must be a request from the controller. We already sent - * a mapaddress if there's a ttl. */ + /* This must be a request from the controller. Since answers to those + * requests are not cached, they do not generate an ADDRMAP event on + * their own. */ tell_controller_about_resolved_result(conn, answer_type, answer_len, (char*)answer, ttl, expires); conn->socks_request->has_finished = 1;

1 0

[tor/maint-0.2.4] Controller: Add CACHED keyword to ADDRMAP events (#8596 part 2/2)
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit 74f5e304e49b8ccde2b97232c49e5025dba21f59 Author: Desoxy <desoxy(a)fastmail.fm> Date: Wed Apr 3 18:50:51 2013 +0200 Controller: Add CACHED keyword to ADDRMAP events (#8596 part 2/2) Add keyword CACHED="YES"/"NO" to ADDRMAP control events to indicate whether the DNS response will be cached or not. --- changes/bug8596 | 3 +++ src/or/addressmap.c | 2 +- src/or/connection_edge.c | 9 ++++----- src/or/control.c | 14 ++++++++------ src/or/control.h | 3 ++- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/changes/bug8596 b/changes/bug8596 new file mode 100644 index 0000000..dd36bad --- /dev/null +++ b/changes/bug8596 @@ -0,0 +1,3 @@ + o Minor features: + - Add CACHED keyword to ADDRMAP events in the control protocol to indicate + whether a DNS result will be cached or not. diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 826eb30..79e4b7c 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -560,7 +560,7 @@ addressmap_register(const char *address, char *new_address, time_t expires, log_info(LD_CONFIG, "Addressmap: (re)mapped '%s' to '%s'", safe_str_client(address), safe_str_client(ent->new_address)); - control_event_address_mapped(address, ent->new_address, expires, NULL); + control_event_address_mapped(address, ent->new_address, expires, NULL, 1); } /** An attempt to resolve address failed at some OR. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 0519708..926fcab 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2044,18 +2044,17 @@ tell_controller_about_resolved_result(entry_connection_t *conn, if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer))); control_event_address_mapped(conn->socks_request->address, - cp, expires, NULL); + cp, expires, NULL, 0); tor_free(cp); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256) { char *cp = tor_strndup(answer, answer_len); control_event_address_mapped(conn->socks_request->address, - cp, expires, NULL); + cp, expires, NULL, 0); tor_free(cp); } else { control_event_address_mapped(conn->socks_request->address, - "<error>", - time(NULL)+ttl, - "error=yes"); + "<error>", time(NULL)+ttl, + "error=yes", 0); } } diff --git a/src/or/control.c b/src/or/control.c index 2a68464..f50b877 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2947,7 +2947,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), - "internal"); + "internal", 0); }); SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); @@ -4024,15 +4024,17 @@ control_event_descriptors_changed(smartlist_t *routers) */ int control_event_address_mapped(const char *from, const char *to, time_t expires, - const char *error) + const char *error, const int cached) { if (!EVENT_IS_INTERESTING(EVENT_ADDRMAP)) return 0; if (expires < 3 || expires == TIME_MAX) send_control_event(EVENT_ADDRMAP, ALL_FORMATS, - "650 ADDRMAP %s %s NEVER %s\r\n", from, to, - error?error:""); + "650 ADDRMAP %s %s NEVER %s%s" + "CACHED=\"%s\"\r\n", + from, to, error?error:"", error?" ":"", + cached?"YES":"NO"); else { char buf[ISO_TIME_LEN+1]; char buf2[ISO_TIME_LEN+1]; @@ -4040,10 +4042,10 @@ control_event_address_mapped(const char *from, const char *to, time_t expires, format_iso_time(buf2,expires); send_control_event(EVENT_ADDRMAP, ALL_FORMATS, "650 ADDRMAP %s %s \"%s\"" - " %s%sEXPIRES=\"%s\"\r\n", + " %s%sEXPIRES=\"%s\" CACHED=\"%s\"\r\n", from, to, buf, error?error:"", error?" ":"", - buf2); + buf2, cached?"YES":"NO"); } return 0; diff --git a/src/or/control.h b/src/or/control.h index 51ae230..0ea7941 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -53,7 +53,8 @@ int control_event_stream_bandwidth_used(void); void control_event_logmsg(int severity, uint32_t domain, const char *msg); int control_event_descriptors_changed(smartlist_t *routers); int control_event_address_mapped(const char *from, const char *to, - time_t expires, const char *error); + time_t expires, const char *error, + const int cached); int control_event_or_authdir_new_descriptor(const char *action, const char *desc, size_t desclen,

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit 3367a7611eb2a4fbedca568e39045971106cb315 Merge: d1dc23c 74f5e30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 5 16:57:53 2013 -0400 Merge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4 changes/bug8596 | 3 +++ src/or/addressmap.c | 2 +- src/or/connection_edge.c | 21 +++++++++------------ src/or/control.c | 14 ++++++++------ src/or/control.h | 3 ++- 5 files changed, 23 insertions(+), 20 deletions(-)

1 0

[tor/master] test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638)
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit d1dc23c9386c6c85ec50c5b4d0a9077ffcb78683 Author: Peter Palfrader <peter(a)palfrader.org> Date: Thu Apr 4 18:05:14 2013 +0200 test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638) --- changes/bug8638 | 3 +++ src/test/test.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug8638 b/changes/bug8638 new file mode 100644 index 0000000..3a790e5 --- /dev/null +++ b/changes/bug8638 @@ -0,0 +1,3 @@ + o Minor features + In our testsuite, create temporary directories with a bit more entropy + in their name to make name collissions less likely. Fixes bug 8638. diff --git a/src/test/test.c b/src/test/test.c index d3d3bd5..0b55f7b 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -88,8 +88,14 @@ setup_directory(void) { static int is_setup = 0; int r; + char rnd[256], rnd32[256]; if (is_setup) return; +/* Due to base32 limitation needs to be a multiple of 5. */ +#define RAND_PATH_BYTES 5 + crypto_rand(rnd, RAND_PATH_BYTES); + base32_encode(rnd32, sizeof(rnd32), rnd, RAND_PATH_BYTES); + #ifdef _WIN32 { char buf[MAX_PATH]; @@ -98,11 +104,11 @@ setup_directory(void) if (!GetTempPathA(sizeof(buf),buf)) tmp = "c:\\windows\\temp"; tor_snprintf(temp_dir, sizeof(temp_dir), - "%s\\tor_test_%d", tmp, (int)getpid()); + "%s\\tor_test_%d_%s", tmp, (int)getpid(), rnd32); r = mkdir(temp_dir); } #else - tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d", (int) getpid()); + tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", (int) getpid(), rnd32); r = mkdir(temp_dir, 0700); #endif if (r) { @@ -2094,6 +2100,7 @@ main(int c, const char **v) return 1; } crypto_set_tls_dh_prime(NULL); + crypto_seed_rng(1); rep_hist_init(); network_init(); setup_directory(); @@ -2106,8 +2113,6 @@ main(int c, const char **v) return 1; } - crypto_seed_rng(1); - atexit(remove_directory); have_failed = (tinytest_main(c, v, testgroups) != 0);

1 0