- tor-commits - lists.torproject.org

[tor/master] Support NAT-PMP on Windows
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 5dbfb1b3e0efc95be34ba7d69852511c9bac1f4b Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Wed Nov 30 19:37:17 2011 +0000 Support NAT-PMP on Windows - Link in libws32 and libiphlpapi, needed for libnatpmp (both in ./configure and when compiling tor-fw-helper-natpmp.c) - Define STATICLIB under Windows, to allow tor-fw-helper-natpmp.c to link - Don't include arpa/inet.h which isn't present in Mingw32 and doesn't appear to be needed on either Windows or MacOS X --- configure.in | 7 +++++-- src/tools/tor-fw-helper/Makefile.am | 2 +- src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 64d9d6d..0de15b4 100644 --- a/configure.in +++ b/configure.in @@ -548,9 +548,12 @@ dnl There are no packages for Debian or Redhat as of this patch if test "$natpmp" = "true"; then AC_DEFINE(NAT_PMP, 1, [Define to 1 if we are building with nat-pmp.]) - TOR_SEARCH_LIBRARY(libnatpmp, $trylibnatpmpdir, [-lnatpmp], - [#include <natpmp.h>], + TOR_SEARCH_LIBRARY(libnatpmp, $trylibnatpmpdir, [-lnatpmp $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI], [#include <natpmp.h>], + [#ifdef MS_WINDOWS + #define STATICLIB + #endif + #include <natpmp.h>], [ int r; natpmp_t natpmp; natpmpresp_t response; diff --git a/src/tools/tor-fw-helper/Makefile.am b/src/tools/tor-fw-helper/Makefile.am index 8f64ad2..393562d 100644 --- a/src/tools/tor-fw-helper/Makefile.am +++ b/src/tools/tor-fw-helper/Makefile.am @@ -15,7 +15,7 @@ noinst_HEADERS = \ if NAT_PMP nat_pmp_ldflags = @TOR_LDFLAGS_libnatpmp@ -nat_pmp_ldadd = -lnatpmp +nat_pmp_ldadd = -lnatpmp @TOR_LIB_IPHLPAPI@ nat_pmp_cppflags = @TOR_CPPFLAGS_libnatpmp@ else nat_pmp_ldflags = 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 f9d5d0d..a8cdbbf 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -9,11 +9,13 @@ #include "orconfig.h" #ifdef NAT_PMP +#ifdef MS_WINDOWS +#define STATICLIB +#endif #include <stdint.h> #include <stdio.h> #include <string.h> #include <errno.h> -#include <arpa/inet.h> // debugging stuff #include <assert.h>

1 0

[tor/master] Make file descriptor type an unsigned integer
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit a65212e371334c95292da1ca460d9d1d9a84d38e Author: Steven Murdoch <Steven Murdoch(a)cl.cam.ac.uk> Date: Wed Nov 30 20:41:27 2011 +0000 Make file descriptor type an unsigned integer This avoids a warning from gcc (comparison between signed and unsigned integer expressions [-Werror=sign-compare]), under Windows --- src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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 a8cdbbf..aaa685e 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -84,7 +84,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(int fd, struct timeval *timeout) +wait_until_fd_readable(unsigned int fd, struct timeval *timeout) { int r; fd_set fds;

1 0

[tor/master] Merge remote-tracking branch 'sjmurdoch/bug1983-port-tor-fw-helper-to-windows'
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 0530e80e5de325ba9d36a13c924950ccd49dbf72 Merge: d04f21b a65212e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 17:51:01 2011 -0500 Merge remote-tracking branch 'sjmurdoch/bug1983-port-tor-fw-helper-to-windows' configure.in | 7 +++++-- src/tools/tor-fw-helper/Makefile.am | 2 +- src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-)

1 0

[tor/master] Add ifdefs to disable #3332 assertions
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit a364f88477105075a202e55b2e44dafa4bf2be51 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Nov 23 14:07:46 2011 -0800 Add ifdefs to disable #3332 assertions --- src/or/directory.c | 4 ++++ src/or/rendclient.c | 6 ++++++ src/or/rendservice.c | 6 ++++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 776b7a2..073b887 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -907,8 +907,12 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, log_debug(LD_DIR, "Initiating %s", dir_conn_purpose_to_string(dir_purpose)); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(is_sensitive_dir_purpose(dir_purpose) && !anonymized_connection)); +#else + (void)is_sensitive_dir_purpose; +#endif /* ensure that we don't make direct connections when a SOCKS server is * configured. */ diff --git a/src/or/rendclient.c b/src/or/rendclient.c index fae9df0..e7ef313 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -139,8 +139,10 @@ rend_client_send_introduction(origin_circuit_t *introcirc, tor_assert(rendcirc->rend_data); tor_assert(!rend_cmp_service_ids(introcirc->rend_data->onion_address, rendcirc->rend_data->onion_address)); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(introcirc->build_state->onehop_tunnel)); tor_assert(!(rendcirc->build_state->onehop_tunnel)); +#endif if (rend_cache_lookup_entry(introcirc->rend_data->onion_address, -1, &entry) < 1) { @@ -331,7 +333,9 @@ rend_client_introduction_acked(origin_circuit_t *circ, } tor_assert(circ->build_state->chosen_exit); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(circ->build_state->onehop_tunnel)); +#endif tor_assert(circ->rend_data); if (request_len == 0) { @@ -343,7 +347,9 @@ rend_client_introduction_acked(origin_circuit_t *circ, rendcirc = circuit_get_by_rend_query_and_purpose( circ->rend_data->onion_address, CIRCUIT_PURPOSE_C_REND_READY); if (rendcirc) { /* remember the ack */ +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(rendcirc->build_state->onehop_tunnel)); +#endif rendcirc->_base.purpose = CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED; /* Set timestamp_dirty, because circuit_expire_building expects * it to specify when a circuit entered the diff --git a/src/or/rendservice.c b/src/or/rendservice.c index e0c1a8c..34d255a 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -910,7 +910,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, time_t *access_time; const or_options_t *options = get_options(); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(circuit->build_state->onehop_tunnel)); +#endif tor_assert(circuit->rend_data); base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, @@ -1394,7 +1396,9 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) crypto_pk_env_t *intro_key; tor_assert(circuit->_base.purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(circuit->build_state->onehop_tunnel)); +#endif tor_assert(circuit->cpath); tor_assert(circuit->rend_data); @@ -1550,7 +1554,9 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) tor_assert(circuit->_base.purpose == CIRCUIT_PURPOSE_S_CONNECT_REND); tor_assert(circuit->cpath); tor_assert(circuit->build_state); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(circuit->build_state->onehop_tunnel)); +#endif tor_assert(circuit->rend_data); hop = circuit->build_state->pending_final_cpath; tor_assert(hop);

1 0

[tor/master] Turn off LearnCircuitBuildTimeout when tor2web mode is on
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit c90c33fd53463b67810b4e2b4c994e952e087698 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Jun 14 01:40:02 2011 -0700 Turn off LearnCircuitBuildTimeout when tor2web mode is on --- src/or/config.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 734efdf..1dd5ed7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3524,6 +3524,24 @@ options_validate(or_options_t *old_options, or_options_t *options, options->RendPostPeriod = MAX_DIR_PERIOD; } + if (options->Tor2webMode && options->LearnCircuitBuildTimeout) { + /* LearnCircuitBuildTimeout and Tor2webMode are incompatible in + * two ways: + * + * - LearnCircuitBuildTimeout results in a low CBT, which + * Tor2webMode's use of one-hop rendezvous circuits lowers + * much further, producing *far* too many timeouts. + * + * - The adaptive CBT code does not update its timeout estimate + * using build times for single-hop circuits. + * + * If we fix both of these issues someday, we should test + * Tor2webMode with LearnCircuitBuildTimeout on again. */ + log_notice(LD_CONFIG,"Tor2webMode is enabled; turning " + "LearnCircuitBuildTimeout off."); + options->LearnCircuitBuildTimeout = 0; + } + if (options->MaxCircuitDirtiness < MIN_MAX_CIRCUIT_DIRTINESS) { log_warn(LD_CONFIG, "MaxCircuitDirtiness option is too short; " "raising to %d seconds.", MIN_MAX_CIRCUIT_DIRTINESS);

1 0

[tor/master] Add ifdefs to disable assertion in connection_ap_handshake_send_begin
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 328c9582a90f65c5f21d05f2de889bc2286dc0ff Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Nov 23 14:10:46 2011 -0800 Add ifdefs to disable assertion in connection_ap_handshake_send_begin --- src/or/connection_edge.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index bba666d..dc15721 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2461,7 +2461,9 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn) begin_type = ap_conn->use_begindir ? RELAY_COMMAND_BEGIN_DIR : RELAY_COMMAND_BEGIN; if (begin_type == RELAY_COMMAND_BEGIN) { +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(circ->build_state->onehop_tunnel == 0); +#endif } if (connection_edge_send_command(edge_conn, begin_type,

1 0

[tor/master] Add support for tor2web mode via configure
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 6db69d9d612462489600df641b91e6ae49dfd382 Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Nov 24 07:53:04 2011 +0100 Add support for tor2web mode via configure --- configure.in | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 64d9d6d..b723f61 100644 --- a/configure.in +++ b/configure.in @@ -145,6 +145,13 @@ if test "$enable_local_appdata" = "yes"; then [Defined if we default to host local appdata paths on Windows]) fi +# Tor2web mode flag +AC_ARG_ENABLE(tor2web-mode, + AS_HELP_STRING(--enable-tor2web-mode, support tor2web non-anonymous mode), +[if test x$enableval = xyes; then + CFLAGS="$CFLAGS -D ENABLE_TOR2WEB_MODE=1" +fi]) + AC_ARG_ENABLE(bufferevents, AS_HELP_STRING(--enable-bufferevents, use Libevent's buffered IO.))

1 0

[tor/master] Merge branch 'feature2553-v4-rebased'
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit d04f21bf394eb9e1781a89d9827476e13cc11086 Merge: 3b88b63 db648fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 14:54:33 2011 -0500 Merge branch 'feature2553-v4-rebased' configure.in | 7 +++++++ doc/tor.1.txt | 7 +++++++ src/or/circuituse.c | 6 ++++++ src/or/config.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/or/connection_edge.c | 10 ++++++++++ src/or/directory.c | 4 ++++ src/or/main.c | 5 +++++ src/or/or.h | 9 +++++++++ src/or/rendclient.c | 10 +++++++++- src/or/rendservice.c | 6 ++++++ 10 files changed, 104 insertions(+), 1 deletions(-)

1 0

[tor/master] Add some more documentation
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit db648fe886fd8ae4f42bb13d0219ca7fa690bdc1 Author: Arturo Filastò <art(a)torproject.org> Date: Thu Nov 24 10:28:38 2011 +0100 Add some more documentation --- doc/tor.1.txt | 5 ++++- src/or/config.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 22c8e88..c73b8d3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -960,7 +960,10 @@ The following options are useful only for clients (that is, if **Tor2webMode** **0**|**1**:: When this option is set, Tor connects to hidden services **non-anonymously**. This option also disables client connections to - non-hidden-service hostnames through Tor. (Default: 0) + non-hidden-service hostnames through Tor. It **must only** be used when + running a tor2web Hidden Service web proxy. + To enable this option the compile time flag --enable-tor2webmode must be + specified. (Default: 0) SERVER OPTIONS -------------- diff --git a/src/or/config.c b/src/or/config.c index 1dd5ed7..adfde81 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1310,7 +1310,8 @@ options_act(const or_options_t *old_options) if (options->Tor2webMode) { log_err(LD_CONFIG, "This copy of Tor was not compiled to run in " "'tor2web mode'. It cannot be run with the Tor2webMode torrc " - "option enabled."); + "option enabled. To enable Tor2webMode recompile with the " + "--enable-tor2webmode option."); return -1; } #endif

1 0

[tor/master] Add Tor2webMode configuration option
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit b2212bf9b4e7f06d7383eb9235392cbdf735bbdb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jun 1 07:03:01 2011 -0700 Add Tor2webMode configuration option --- doc/tor.1.txt | 4 ++++ src/or/config.c | 1 + src/or/or.h | 5 +++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f5be391..22c8e88 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -957,6 +957,10 @@ The following options are useful only for clients (that is, if Tor will look at the UseOptimisticData parameter in the networkstatus. (Default: auto) +**Tor2webMode** **0**|**1**:: + When this option is set, Tor connects to hidden services + **non-anonymously**. This option also disables client connections to + non-hidden-service hostnames through Tor. (Default: 0) SERVER OPTIONS -------------- diff --git a/src/or/config.c b/src/or/config.c index 06d7d5c..b2de15e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -394,6 +394,7 @@ static config_var_t _option_vars[] = { V(TestSocks, BOOL, "0"), OBSOLETE("TestVia"), V(TokenBucketRefillInterval, MSEC_INTERVAL, "100 msec"), + V(Tor2webMode, BOOL, "0"), V(TrackHostExits, CSV, NULL), V(TrackHostExitsExpire, INTERVAL, "30 minutes"), OBSOLETE("TrafficShaping"), diff --git a/src/or/or.h b/src/or/or.h index 67ba62b..8515db6 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3008,6 +3008,11 @@ typedef struct { int AllDirActionsPrivate; /**< Should every directory action be sent * through a Tor circuit? */ + /** Run in 'tor2web mode'? (I.e. only make client connections to hidden + * services, and use a single hop for all hidden-service-related + * circuits.) */ + int Tor2webMode; + int ConnLimit; /**< Demanded minimum number of simultaneous connections. */ int _ConnLimit; /**< Maximum allowed number of simultaneous connections. */ int RunAsDaemon; /**< If true, run in the background. (Unix only) */

1 0