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

[tor/master] Add missing documentation for some options introduced in 0.2.3.x
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit b14ac10b7fdc6718d420b8c317b984c7ab1f5530 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 17 15:51:32 2012 -0500 Add missing documentation for some options introduced in 0.2.3.x --- changes/bug4012 | 8 ++++++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/changes/bug4012 b/changes/bug4012 new file mode 100644 index 0000000..082f39d --- /dev/null +++ b/changes/bug4012 @@ -0,0 +1,8 @@ + o Minor bugfixes (documentation): + - Add missing documentation for the MaxClientCircuitsPending, + UseMicrodescriptors, UserspaceIOCPBuffers, and + _UseFilteringSSLBufferevents options, all introduced during + the 0.2.3.x series. + + + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5ac2ba0..3715171 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -487,6 +487,21 @@ Other options can be specified either on the command-line (--option and you're running on Windows, setting this option to 1 will tell Libevent not to use the Windows IOCP networking API. (Default: 1) +**UserspaceIOCPBuffers** **0**|**1**:: + If IOCP is enabled (see DisableIOCP above), setting this option to 1 + will tell Tor to disable kernel-space TCP buffers, in order to avoid + needless copy operations and try not to run out of non-paged RAM. + This feature is experimental; don't use it yet unless you're eager to + help tracking down bugs. (Default: 0) + +**_UseFilteringSSLBufferevents** **0**|**1**:: + Tells Tor to do its SSL communication using a chain of + bufferevents: one for SSL and one for networking. This option has no + effect if bufferevents are disabled (in which case it can't turn on), or + if IOCP bufferevents are enabled (in which case it can't turn off). This + option is useful for debugging only; most users shouldn't touch it. + (Default: 0) + **CountPrivateBandwidth** **0**|**1**:: If this option is set, then Tor's rate-limiting applies not only to remote connections, but also to connections to private addresses like @@ -757,6 +772,11 @@ The following options are useful only for clients (that is, if but never attach a new stream to a circuit that is too old. (Default: 10 minutes) +**MaxClientCircuitsPending** __NUM__:: + Do not allow more than NUM circuits to be pending at a time for handling + client streams. A circuit is pending if we have begun constructing it, + but it has not yet been completely constructed. (Default: 32) + **NodeFamily** __node__,__node__,__...__:: The Tor servers, defined by their identity fingerprints or nicknames, constitute a "family" of similar or co-administered servers, so never use @@ -1042,6 +1062,15 @@ The following options are useful only for clients (that is, if To enable this option the compile time flag --enable-tor2webmode must be specified. (Default: 0) +**UseMicrodescriptors** **0**|**1**|**auto**:: + Microdescriptors are a smaller version of the information that Tor needs + in order to build its circuits. Using microdescriptors makes Tor clients + download less directory information, thus saving bandwidth. Directory + caches need to fetch regular descriptors and microdescriptors, so this + option doesn't save any bandwidth for them. If this option is set to + "auto" (recommended) then it is on for all clients that do not set + FetchUselessDescriptors. (Default: auto) + SERVER OPTIONS --------------

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 93d3a917e878e42950faf6199205a6933a40c900 Merge: ee717f3 676bba8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 14:45:18 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4012_022 | 3 +++ doc/tor.1.txt | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-)

1 0

[tor/master] Documentation for GiveGuardFlagTo... option
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 676bba8e0c91b7885aa8a9b7f55b008ccccfe282 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 17 15:28:23 2012 -0500 Documentation for GiveGuardFlagTo... option --- changes/bug4012_022 | 3 +++ doc/tor.1.txt | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug4012_022 b/changes/bug4012_022 new file mode 100644 index 0000000..f101db5 --- /dev/null +++ b/changes/bug4012_022 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Document the GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays + directory authority option (introduced in Tor 0.2.2.34). diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d91f873..558b31b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1347,6 +1347,10 @@ DIRECTORY AUTHORITY SERVER OPTIONS votes on whether to accept relays as hidden service directories. (Default: 1) +GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays **0**|**1**:: + When this option is set to 0, do not vote to give the Guard flag to any + version of Tor vulnerable to CVE-2011-2769. (Default: 0) + HIDDEN SERVICE OPTIONS ----------------------

1 0

[tor/maint-0.2.2] Documentation for GiveGuardFlagTo... option
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 676bba8e0c91b7885aa8a9b7f55b008ccccfe282 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 17 15:28:23 2012 -0500 Documentation for GiveGuardFlagTo... option --- changes/bug4012_022 | 3 +++ doc/tor.1.txt | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug4012_022 b/changes/bug4012_022 new file mode 100644 index 0000000..f101db5 --- /dev/null +++ b/changes/bug4012_022 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Document the GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays + directory authority option (introduced in Tor 0.2.2.34). diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d91f873..558b31b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1347,6 +1347,10 @@ DIRECTORY AUTHORITY SERVER OPTIONS votes on whether to accept relays as hidden service directories. (Default: 1) +GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays **0**|**1**:: + When this option is set to 0, do not vote to give the Guard flag to any + version of Tor vulnerable to CVE-2011-2769. (Default: 0) + HIDDEN SERVICE OPTIONS ----------------------

1 0

[tor/master] Use tor_socket_t, not unsigned, in tor-fw-helper-natmp.c
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit ee717f35c44fa0ec3fc37ca8865a80e321105c33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 13:14:44 2012 -0500 Use tor_socket_t, not unsigned, in tor-fw-helper-natmp.c --- changes/bug1983_win64 | 3 +++ src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug1983_win64 b/changes/bug1983_win64 new file mode 100644 index 0000000..6d2eae3 --- /dev/null +++ b/changes/bug1983_win64 @@ -0,0 +1,3 @@ + o Minor bugfixes + - Use an appropriate-width type for sockets in tor-fw-helper on + win664. Fixes bug 1983 at last. Bugfix on 0.2.3.9-alpha. diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c index 2380b14..a3a52d1 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -87,7 +87,7 @@ tor_natpmp_cleanup(tor_fw_options_t *tor_fw_options, void *backend_state) /** Use select() to wait until we can read on fd. */ static int -wait_until_fd_readable(unsigned int fd, struct timeval *timeout) +wait_until_fd_readable(tor_socket_t fd, struct timeval *timeout) { int r; fd_set fds;

1 0

[obfsproxy/master] Change argument parsing to support logfiles for managed proxies.
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 93f3a58532623a4e08106fdef99fa289660f5ca5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 18 04:42:38 2012 +0200 Change argument parsing to support logfiles for managed proxies. --- src/main.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main.c b/src/main.c index ec018d6..91f0395 100644 --- a/src/main.c +++ b/src/main.c @@ -133,14 +133,14 @@ is_supported_protocol(const char *name) static int handle_obfsproxy_args(const char *const *argv) { - int logmethod_set=0; + int logfile_set=0; int logsev_set=0; int i=1; while (argv[i] && !strncmp(argv[i],"--",2)) { if (!strncmp(argv[i], "--log-file=", 11)) { - if (logmethod_set) { + if (logfile_set) { log_warn("You've already set a log file!"); exit(1); } @@ -149,7 +149,7 @@ handle_obfsproxy_args(const char *const *argv) log_warn("Failed creating logfile."); exit(1); } - logmethod_set=1; + logfile_set=1; } else if (!strncmp(argv[i], "--log-min-severity=", 19)) { if (logsev_set) { log_warn("You've already set a min. log severity!"); @@ -171,15 +171,6 @@ handle_obfsproxy_args(const char *const *argv) } logsev_set=1; } else if (!strncmp(argv[i], "--managed", 10)) { - if (logsev_set) { - printf("You can't combine --managed with other log options.\n"); - exit(1); - } - if (log_set_method(LOG_METHOD_NULL, NULL) < 0) { - printf("Error at setting logging severity.\n"); - exit(1); - } - logsev_set=1; is_external_proxy=0; } else { log_warn("Unrecognizable obfsproxy argument '%s'", argv[i]); @@ -188,6 +179,17 @@ handle_obfsproxy_args(const char *const *argv) i++; } + if (!is_external_proxy && !logfile_set && logsev_set) { + printf("obfsproxy in managed proxy mode can only log to a file.\n"); + exit(1); + } else if (!is_external_proxy && !logfile_set) { /* && !logsev_set */ + /* managed proxies without a log file must not log at all. */ + if (log_set_method(LOG_METHOD_NULL, NULL) < 0) { + printf("Error at setting logging severity.\n"); + exit(1); + } + } + return i; }

1 0

[obfsproxy/master] Document public logging functions.
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 7efc156ce75de996dd0ff13aa447fba83b7fd528 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 18 04:50:36 2012 +0200 Document public logging functions. --- src/util.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util.c b/src/util.c index 2e84cc6..0ac7811 100644 --- a/src/util.c +++ b/src/util.c @@ -551,6 +551,7 @@ logv(int severity, const char *format, va_list ap) /**** Public logging API. ****/ +/** Public function for logging an error and then exiting. */ void log_error(const char *format, ...) { @@ -563,6 +564,7 @@ log_error(const char *format, ...) exit(1); } +/** Public function for logging a warning. */ void log_warn(const char *format, ...) { @@ -574,6 +576,7 @@ log_warn(const char *format, ...) va_end(ap); } +/** Public function for logging an informative message. */ void log_info(const char *format, ...) { @@ -585,6 +588,7 @@ log_info(const char *format, ...) va_end(ap); } +/** Public function for logging a debugging message. */ void log_debug(const char *format, ...) { @@ -596,6 +600,8 @@ log_debug(const char *format, ...) va_end(ap); } +/** Public function for logging a debugging message, given a format + string in format, and a va_list ap. */ void log_debug_raw(const char *format, va_list ap) {

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4928'
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 99e4809b3ada50bd14b46f7eb9b23f4ebaaff35c Merge: a60c1b4 7efc156 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 10:59:56 2012 -0500 Merge remote-tracking branch 'asn/bug4928' src/main.c | 60 ++++++++++++++++++++++++++------------------------------ src/managed.c | 28 ++++++++++++++++++++++++++ src/util.c | 12 +++++++++++ src/util.h | 2 + 4 files changed, 70 insertions(+), 32 deletions(-)

1 0

[obfsproxy/master] Beautify argument parsing.
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 217b25e1d239467df3ecac08d54607135764f792 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 18 04:48:04 2012 +0200 Beautify argument parsing. - Fix some indentation problems. - Use log_error() instead of 'log_*(); exit(1);'. --- src/main.c | 42 ++++++++++++++++++------------------------ 1 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/main.c b/src/main.c index 91f0395..7ebdd51 100644 --- a/src/main.c +++ b/src/main.c @@ -140,42 +140,36 @@ handle_obfsproxy_args(const char *const *argv) while (argv[i] && !strncmp(argv[i],"--",2)) { if (!strncmp(argv[i], "--log-file=", 11)) { - if (logfile_set) { - log_warn("You've already set a log file!"); - exit(1); - } - if (log_set_method(LOG_METHOD_FILE, - (char *)argv[i]+11) < 0) { - log_warn("Failed creating logfile."); - exit(1); - } + if (logfile_set) + log_error("You've already set a log file!"); + if (log_set_method(LOG_METHOD_FILE, (char *)argv[i]+11) < 0) + log_error("Failed creating logfile."); + logfile_set=1; } else if (!strncmp(argv[i], "--log-min-severity=", 19)) { + if (logsev_set) + log_error("You've already set a min. log severity!"); + if (log_set_min_severity((char *)argv[i]+19) < 0) + log_error("Error at setting logging severity"); + + logsev_set=1; + } else if (!strncmp(argv[i], "--no-log", 9)) { if (logsev_set) { - log_warn("You've already set a min. log severity!"); + printf("You've already set a min. log severity!\n"); exit(1); } - if (log_set_min_severity((char *)argv[i]+19) < 0) { - log_warn("Error at setting logging severity"); + if (log_set_method(LOG_METHOD_NULL, NULL) < 0) { + printf("Error at setting logging severity.\n"); exit(1); } + logsev_set=1; - } else if (!strncmp(argv[i], "--no-log", 9)) { - if (logsev_set) { - printf("You've already set a min. log severity!\n"); - exit(1); - } - if (log_set_method(LOG_METHOD_NULL, NULL) < 0) { - printf("Error at setting logging severity.\n"); - exit(1); - } - logsev_set=1; } else if (!strncmp(argv[i], "--managed", 10)) { is_external_proxy=0; } else { - log_warn("Unrecognizable obfsproxy argument '%s'", argv[i]); - exit(1); + log_error("Unrecognizable obfsproxy argument '%s'", argv[i]); } + i++; }

1 0

[obfsproxy/master] Add logging to src/managed.c.
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 8754b6626d758adf138cd8fc06328ae24d3e7bd5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 18 04:44:09 2012 +0200 Add logging to src/managed.c. --- src/managed.c | 28 ++++++++++++++++++++++++++++ src/util.c | 6 ++++++ src/util.h | 2 ++ 3 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/managed.c b/src/managed.c index d70c1cf..dfd8a3f 100644 --- a/src/managed.c +++ b/src/managed.c @@ -112,6 +112,27 @@ assert_proxy_env(managed_proxy_t *proxy) } } +/** Log the environment variables that tor prepared for proxy. */ +static inline void +log_proxy_env(managed_proxy_t *proxy) +{ + obfs_assert(proxy); + + log_debug("Proxy environment:\n" + "state_loc: '%s'\nconf_proto_version: '%s'\ntransports: '%s'", + proxy->vars.state_loc, + proxy->vars.conf_proto_version, + proxy->vars.transports); + + if (proxy->is_server) { + log_debug("Proxy environment (cont):\n" + "extended_port: '%s'\nor_port: '%s'\nbindaddrs: '%s'", + proxy->vars.extended_port, + proxy->vars.or_port, + proxy->vars.bindaddrs); + } +} + /** This function is used for obfsproxy to communicate with tor. Practically a wrapper of printf, it prints 'format' and the @@ -125,6 +146,11 @@ print_protocol_line(const char *format, ...) va_start(ap,format); vprintf(format, ap); fflush(stdout); + + /* log the protocol message */ + log_debug("We sent:"); + log_debug_raw(format, ap); + va_end(ap); } @@ -246,6 +272,8 @@ validate_environment(managed_proxy_t *proxy) assert_proxy_env(proxy); + if (log_do_debug()) log_proxy_env(proxy); + if (proxy->is_server) { if (validate_bindaddrs(proxy->vars.bindaddrs, proxy->vars.transports) < 0) { status = ST_ENV_FAIL_BINDADDR; diff --git a/src/util.c b/src/util.c index c63a651..2e84cc6 100644 --- a/src/util.c +++ b/src/util.c @@ -595,3 +595,9 @@ log_debug(const char *format, ...) va_end(ap); } + +void +log_debug_raw(const char *format, va_list ap) +{ + logv(LOG_SEV_DEBUG, format, ap); +} diff --git a/src/util.h b/src/util.h index 8a7585b..a8588c2 100644 --- a/src/util.h +++ b/src/util.h @@ -171,6 +171,8 @@ void log_info(const char *format, ...) void log_debug(const char *format, ...) ATTR_PRINTF_1; +void log_debug_raw(const char *format, va_list ap); + /** Assertion checking. We don't ever compile assertions out, and we want precise control over the error messages, so we use our own assertion macros. */

1 0