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

[tor/master] Make transports.c logs a bit more helpful.
by nickm＠torproject.org 07 May '12

07 May '12

commit e603692adcd50a4ea5b3043caf360dba5c38a8dd Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu May 3 04:38:53 2012 +0300 Make transports.c logs a bit more helpful. --- src/or/transports.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 564603e..b8b2331 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -340,11 +340,12 @@ pt_configure_remaining_proxies(void) /* This proxy is marked by a SIGHUP. Check whether we need to restart it. */ if (proxy_needs_restart(mp)) { - log_info(LD_GENERAL, "Preparing managed proxy for restart."); + log_info(LD_GENERAL, "Preparing managed proxy '%s' for restart.", + mp->argv[0]); proxy_prepare_for_restart(mp); } else { /* it doesn't need to be restarted. */ - log_info(LD_GENERAL, "Nothing changed for managed proxy after HUP: " - "not restarting."); + log_info(LD_GENERAL, "Nothing changed for managed proxy '%s' after HUP: " + "not restarting.", mp->argv[0]); } continue; @@ -387,7 +388,8 @@ configure_proxy(managed_proxy_t *mp) pos = tor_read_all_handle(tor_process_get_stdout_pipe(mp->process_handle), stdout_buf, sizeof(stdout_buf) - 1, NULL); if (pos < 0) { - log_notice(LD_GENERAL, "Failed to read data from managed proxy"); + log_notice(LD_GENERAL, "Failed to read data from managed proxy '%s'.", + mp->argv[0]); mp->conf_state = PT_PROTO_BROKEN; goto done; } @@ -449,11 +451,13 @@ configure_proxy(managed_proxy_t *mp) } else if (r == IO_STREAM_EAGAIN) { /* check back later */ return; } else if (r == IO_STREAM_CLOSED || r == IO_STREAM_TERM) { /* snap! */ - log_notice(LD_GENERAL, "Managed proxy stream closed. " - "Most probably application stopped running"); + log_warn(LD_GENERAL, "Our communication channel with the managed proxy " + "'%s' closed. Most probably application stopped running.", + mp->argv[0]); mp->conf_state = PT_PROTO_BROKEN; } else { /* unknown stream status */ - log_notice(LD_GENERAL, "Unknown stream status while configuring proxy."); + log_warn(LD_BUG, "Unknown stream status '%d' while configuring managed " + "proxy '%s'.", r, mp->argv[0]); } /* if the proxy finished configuring, exit the loop. */ @@ -586,8 +590,8 @@ handle_finished_proxy(managed_proxy_t *mp) case PT_PROTO_ACCEPTING_METHODS: case PT_PROTO_COMPLETED: default: - log_warn(LD_CONFIG, "Unexpected managed proxy state in " - "handle_finished_proxy()."); + log_warn(LD_CONFIG, "Unexpected state '%d' of managed proxy '%s'.", + mp->conf_state, mp->argv[0]); tor_assert(0); } @@ -612,11 +616,13 @@ handle_methods_done(const managed_proxy_t *mp) tor_assert(mp->transports); if (smartlist_len(mp->transports) == 0) - log_notice(LD_GENERAL, "Proxy was spawned successfully, " - "but it didn't laucn any pluggable transport listeners!"); + log_notice(LD_GENERAL, "Managed proxy '%s' was spawned successfully, " + "but it didn't launch any pluggable transport listeners!", + mp->argv[0]); - log_info(LD_CONFIG, "%s managed proxy configuration completed!", - mp->is_server ? "Server" : "Client"); + log_info(LD_CONFIG, "%s managed proxy '%s' configuration completed!", + mp->is_server ? "Server" : "Client", + mp->argv[0]); } /** Handle a configuration protocol line received from a @@ -624,7 +630,8 @@ handle_methods_done(const managed_proxy_t *mp) void handle_proxy_line(const char *line, managed_proxy_t *mp) { - log_debug(LD_GENERAL, "Got a line from managed proxy: %s", line); + log_info(LD_GENERAL, "Got a line from managed proxy '%s': (%s)", + mp->argv[0], line); if (strlen(line) < SMALLEST_MANAGED_LINE_SIZE) { log_warn(LD_GENERAL, "Managed proxy configuration line is too small. " @@ -710,7 +717,7 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) err: mp->conf_state = PT_PROTO_BROKEN; log_warn(LD_CONFIG, "Managed proxy at '%s' failed the configuration protocol" - " and will be destroyed.", mp->argv ? mp->argv[0] : ""); + " and will be destroyed.", mp->argv[0]); } /** Parses an ENV-ERROR line and warns the user accordingly. */

1 0

[tor/master] Document some transports.c behaviors and assumptions
by nickm＠torproject.org 07 May '12

07 May '12

commit 9ceec869b5901776285e72d659faa9ba67b80faa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 09:55:14 2012 -0400 Document some transports.c behaviors and assumptions --- src/or/transports.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index b8b2331..09fd69b 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1034,8 +1034,11 @@ create_managed_proxy_environment(const managed_proxy_t *mp) } /** Create and return a new managed proxy for transport using - * proxy_argv. If is_server is true, it's a server - * managed proxy. */ + * proxy_argv. Also, add it to the global managed proxy list. If + * is_server is true, it's a server managed proxy. Takes ownership of + * proxy_argv. + * + * Requires that proxy_argv have at least one element. */ static managed_proxy_t * managed_proxy_create(const smartlist_t *transport_list, char **proxy_argv, int is_server) @@ -1063,7 +1066,13 @@ managed_proxy_create(const smartlist_t *transport_list, /** Register proxy with proxy_argv, supporting transports in * transport_list, to the managed proxy subsystem. - * If is_server is true, then the proxy is a server proxy. */ + * If is_server is true, then the proxy is a server proxy. + * + * Takes ownership of proxy_argv. + * + * Requires that proxy_argv be a NULL-terminated array of command-line + * elements, containing at least one element. + **/ void pt_kickstart_proxy(const smartlist_t *transport_list, char **proxy_argv, int is_server) @@ -1071,6 +1080,10 @@ pt_kickstart_proxy(const smartlist_t *transport_list, managed_proxy_t *mp=NULL; transport_t *old_transport = NULL; + if (!proxy_argv || !proxy_argv[0]) { + return; + } + mp = get_managed_proxy_by_argv_and_type(proxy_argv, is_server); if (!mp) { /* we haven't seen this proxy before */

1 0

[tor/master] Changes file for bug 5070
by nickm＠torproject.org 07 May '12

07 May '12

commit a75941dcd54be0bfca8bf0709e74c959f8d2cb04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 09:56:12 2012 -0400 Changes file for bug 5070 --- changes/bug5070 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug5070 b/changes/bug5070 new file mode 100644 index 0000000..0b8d00a --- /dev/null +++ b/changes/bug5070 @@ -0,0 +1,3 @@ + o Minor features: + - Improve log messages about managed transports. Resolves ticket + 5070.

1 0

[tor/master] Fix an overwide line
by nickm＠torproject.org 07 May '12

07 May '12

commit 74810f95ade6e35ea841442dba7459d4c4ce0179 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 10:59:23 2012 -0400 Fix an overwide line --- src/or/transports.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 09fd69b..eb076ae 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -344,8 +344,8 @@ pt_configure_remaining_proxies(void) mp->argv[0]); proxy_prepare_for_restart(mp); } else { /* it doesn't need to be restarted. */ - log_info(LD_GENERAL, "Nothing changed for managed proxy '%s' after HUP: " - "not restarting.", mp->argv[0]); + log_info(LD_GENERAL, "Nothing changed for managed proxy '%s' after " + "HUP: not restarting.", mp->argv[0]); } continue;

1 0

[tor/master] Fix comments: There is no such thing as a NUL pointer
by nickm＠torproject.org 07 May '12

07 May '12

commit 39e69a0a8c9147f140de327b20ba44619297e738 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 10:57:59 2012 -0400 Fix comments: There is no such thing as a NUL pointer --- src/or/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index bfed4e5..ab4f160 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5099,7 +5099,7 @@ parse_client_transport_line(const char *line, int validate_only) *tmp++ = smartlist_get(items, 2); smartlist_del_keeporder(items, 2); } - *tmp = NULL; /*terminated with NUL pointer, just like execve() likes it*/ + *tmp = NULL; /*terminated with NULL, just like execve() likes it*/ /* kickstart the thing */ pt_kickstart_client_proxy(transport_list, proxy_argv); @@ -5222,7 +5222,7 @@ parse_server_transport_line(const char *line, int validate_only) *tmp++ = smartlist_get(items, 2); smartlist_del_keeporder(items, 2); } - *tmp = NULL; /*terminated with NUL pointer, just like execve() likes it*/ + *tmp = NULL; /*terminated with NULL, just like execve() likes it*/ /* kickstart the thing */ pt_kickstart_server_proxy(transport_list, proxy_argv);

1 0

[tor/master] Using %d to printf an enum may not be by-the-standard okay.
by nickm＠torproject.org 07 May '12

07 May '12

commit eefdb9eec25463df012a27cdc28b6f7b73831d29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 11:02:17 2012 -0400 Using %d to printf an enum may not be by-the-standard okay. --- src/or/transports.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index eb076ae..07b9371 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -457,7 +457,7 @@ configure_proxy(managed_proxy_t *mp) mp->conf_state = PT_PROTO_BROKEN; } else { /* unknown stream status */ log_warn(LD_BUG, "Unknown stream status '%d' while configuring managed " - "proxy '%s'.", r, mp->argv[0]); + "proxy '%s'.", (int)r, mp->argv[0]); } /* if the proxy finished configuring, exit the loop. */ @@ -591,7 +591,7 @@ handle_finished_proxy(managed_proxy_t *mp) case PT_PROTO_COMPLETED: default: log_warn(LD_CONFIG, "Unexpected state '%d' of managed proxy '%s'.", - mp->conf_state, mp->argv[0]); + (int)mp->conf_state, mp->argv[0]); tor_assert(0); }

1 0

[tor/master] Merge branch 'bug5070_take2'
by nickm＠torproject.org 07 May '12

07 May '12

commit 120d524fba10fb3bea7caa762e3324e95bc9e529 Merge: c648f97 eefdb9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 11:03:33 2012 -0400 Merge branch 'bug5070_take2' changes/bug5070 | 3 ++ src/or/config.c | 4 +- src/or/transports.c | 56 ++++++++++++++++++++++++++++++++++---------------- 3 files changed, 43 insertions(+), 20 deletions(-)

1 0

[metrics-web/master] Specify descriptor type annotations.
by karsten＠torproject.org 07 May '12

07 May '12

commit 0125aad501901f84651ecededcc9565e5f6a32fe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 7 10:34:18 2012 +0200 Specify descriptor type annotations. --- web/WEB-INF/formats.jsp | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index f2a55ff..1dd1d31 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -44,7 +44,7 @@ including </ol> -All data described in this report are available for download on the +All data described on this page are available for download on the <a href="data.html">data</a> page. This page is based on a technical report (<a href="papers/data-2011-03-14.pdf">PDF</a>) @@ -53,6 +53,48 @@ and is very likely more recent than the report. <hr> +<a name="descriptortypes"></a> +<h3><a href="#descriptortypes" class="anchor">Descriptor types</a></h3> + + +Any file containing descriptors described on this page may contain meta +data in its first text line using the format +<tt>@type $descriptortype $major.$minor</tt>. +Any tool that processes these descriptors may parse files without meta +data or with an unknown descriptor type at its own risk, can safely parse +files with known descriptor type and same major version number, and should +not parse files with known descriptor type and higher major version +number. + + + +The following descriptor types and versions are known. +Gray entries are either not yet implemented or deprecated, black entries +are recent: + + +<ul> +<li><tt>@type server-descriptor 1.0</tt></li> +<li><tt>@type extra-info 1.0</tt></li> +<li><tt>@type directory 1.0</tt></li> +<li><tt>@type network-status-2 1.0</tt></li> +<li><tt>@type network-status-consensus-3 +1.0</tt></li> +<li><tt>@type network-status-vote-3 1.0</tt></li> +<li><tt>@type bridge-network-status 1.0</tt></li> +<li><tt>@type bridge-server-descriptor +1.0</tt></li> +<li><tt>@type bridge-extra-info 1.0</tt></li> +<li><tt>@type torperf 1.0</tt></li> +<li><tt>@type bridge-pool-assignment +1.0</tt></li> +<li><tt>@type gettor 1.0</tt></li> +<li><tt>@type tordnsel 1.0</tt></li> +</ul> + +<hr> + + <a name="serverdesc"></a> <h3><a href="#serverdesc" class="anchor">Server descriptors and network statuses</a></h3>

1 0

[tor/master] fix quad typo in comments
by arma＠torproject.org 07 May '12

07 May '12

commit c648f9751f5639073ba70860dde6a8091bc6a6b8 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 7 01:54:53 2012 -0400 fix quad typo in comments i assume if nickm maintained "libeven" this would never have been introduced. :) --- src/common/compat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 1a03f5e..57fc021 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -129,7 +129,7 @@ tor_open_cloexec(const char *path, int flags, unsigned mode) if (fd >= 0) return fd; /* If we got an error, see if it is EINVAL. EINVAL might indicate that, - * event though we were built on a system with O_CLOEXEC support, we + * even though we were built on a system with O_CLOEXEC support, we * are running on one without. */ if (errno != EINVAL) return -1; @@ -980,7 +980,7 @@ tor_open_socket(int domain, int type, int protocol) if (SOCKET_OK(s)) goto socket_ok; /* If we got an error, see if it is EINVAL. EINVAL might indicate that, - * event though we were built on a system with SOCK_CLOEXEC support, we + * even though we were built on a system with SOCK_CLOEXEC support, we * are running on one without. */ if (errno != EINVAL) return s; @@ -1014,7 +1014,7 @@ tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) if (SOCKET_OK(s)) goto socket_ok; /* If we got an error, see if it is ENOSYS. ENOSYS indicates that, - * event though we were built on a system with accept4 support, we + * even though we were built on a system with accept4 support, we * are running on one without. Also, check for EINVAL, which indicates that * we are missing SOCK_CLOEXEC support. */ if (errno != EINVAL && errno != ENOSYS) @@ -1092,7 +1092,7 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) if (r == 0) goto sockets_ok; /* If we got an error, see if it is EINVAL. EINVAL might indicate that, - * event though we were built on a system with SOCK_CLOEXEC support, we + * even though we were built on a system with SOCK_CLOEXEC support, we * are running on one without. */ if (errno != EINVAL) return -errno;

1 0

r25641: {website} remove dead mirrors and update the table. (in website/trunk: . include)
by Andrew Lewman 06 May '12

06 May '12

Author: phobos Date: 2012-05-06 16:36:22 +0000 (Sun, 06 May 2012) New Revision: 25641 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: remove dead mirrors and update the table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-05-05 12:11:13 UTC (rev 25640) +++ website/trunk/include/mirrors-table.wmi 2012-05-06 16:36:22 UTC (rev 25641) @@ -86,6 +86,40 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>IS</td> + + <td>torproject.is</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IT</td> <td></td> @@ -292,23 +326,6 @@ <td>DE</td> - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - <td>factor.cc</td> <td>Up to date</td> @@ -579,15 +596,15 @@ <tr> - <td>EE</td> + <td>INT</td> - <td>CyberSIDE</td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -596,23 +613,6 @@ <tr> - <td>IS</td> - - <td>torproject.is</td> - - <td>Out of date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td></td> @@ -732,36 +732,36 @@ <tr> - <td>NL</td> + <td>DE</td> <td></td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> + <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> - <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>INT</td> + <td>NL</td> - <td>CoralCDN</td> + <td></td> - <td>Unknown</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> + <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> + <td> - </td> </tr> <tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-05-05 12:11:13 UTC (rev 25640) +++ website/trunk/update-mirrors.pl 2012-05-06 16:36:22 UTC (rev 25641) @@ -287,26 +287,6 @@ updateDate => "Unknown", }, - mirror017 => { - adminContact => "", - orgName => "Technica-03", - isoCC => "UA", - subRegion => "Ukraine", - region => "Eastern Europe", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "No", - httpWebsiteMirror => "http://torua.reactor-xg.kiev.ua/", - httpsWebsiteMirror => "", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://tordistua.reactor-xg.kiev.ua/", - httpsDistMirror => "", - rsyncDistMirror => "", - hiddenServiceMirror => "", - updateDate => "Unknown", - }, - mirror018 => { adminContact => "", orgName => "chaos darmstadt", @@ -695,24 +675,6 @@ rsyncDistMirror => "", hiddenServiceMirror => "", }, - mirror046 => { - adminContact => "", - orgName => "", - isoCC => "DE", - subRegion => "", - region => "DE", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "No", - httpWebsiteMirror => "http://mirror.open-networx.org/torproject.org/", - httpsWebsiteMirror => "https://mirror.open-networx.org/torproject.org/", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://mirror.open-networx.org/torproject.org/dist/", - httpsDistMirror => "https://mirror.open-networx.org/torproject.org/dist/", - rsyncDistMirror => "", - hiddenServiceMirror => "", - }, mirror048 => { adminContact => "", orgName => "", @@ -928,24 +890,6 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", - }, - mirror060 => { - adminContact => "", - orgName => "Dearstar", - isoCC => "US", - subRegion => "", - region => "US", - ipv4 => "True", - ipv6 => "True", - loadBalanced => "No", - httpWebsiteMirror => "http://tor.dearstar.net/", - httpsWebsiteMirror => "", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://tor.dearstar.net/dist/", - httpsDistMirror => "", - rsyncDistMirror => "", - hiddenServiceMirror => "", } );

1 0