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

[torspec/master] Turn questions into declarations in dir-spec.txt
by nickm＠torproject.org 16 May '12

16 May '12

commit 4d6c1a8894c6e08ea781e77b17abe0275e072ca2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:07:25 2012 -0400 Turn questions into declarations in dir-spec.txt --- dir-spec.txt | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 7fbed8e..d9e4157 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1089,13 +1089,6 @@ The "onion-key" element as specified in 2.1. - [… [View More]

1 0

[torspec/master] Remove consensus index spec which is not implemented.
by nickm＠torproject.org 16 May '12

16 May '12

commit 40a3a7d9338572b03f74ade07486bc2046813cd0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 18 12:10:04 2012 +0200 Remove consensus index spec which is not implemented. Whenever we implement the consensus index we may want to revert this patch (or part of it) to include its specification in dir-spec.txt. --- dir-spec.txt | 63 ++++++--------------------------------------------------- 1 files changed, 7 insertions(+), 56 deletions(-) diff --git … [View More]a/dir-spec.txt b/dir-spec.txt index be140a5..7fbed8e 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2129,43 +2129,6 @@ [As in the consensus; the signature object is the same as in the consensus document.] -3.8. Consensus index - - Authorities additionally may generate and serve a consensus-index - document. Its format is: - - "consensus-index" SP version NL - - [At start, exactly once.] - - "valid-after" SP YYYY-MM-DD SP HH:MM:SS NL - "valid-until" SP YYYY-MM-DD SP HH:MM:SS NL - - [As in the consensus] - - "document" SP flavor SP length 1*(SP algname "=" digest) NL - - [Any number.] - - There must be one "document" line for each generated consensus - flavor. "length" describes the length of the signed portion of - a consensus (the signatures themselves are not included), along - with one or more "digests" of that signed portion. Digests are - given in hex. The algorithm "sha256" MUST be included; others - are allowed. - [What's the reason for using a different format than in the - "additional-digest" lines of detached signatures? -KL] - - "directory-signature" SP algname SP identity SP signing-key-digest - NL signature - - [Any number.] - - [As "additional-signature" lines in detached signatures, but - without the "flavor" part.] - - [Actually, is it a bug that the "flavor" part is missing? -KL] - 4. Directory server operation All directory authorities and directory caches ("directory servers") @@ -2275,10 +2238,6 @@ [XXX possible future features include support for downloading old consensuses.] - An authority further makes the consensus index available at - /tor/status-vote/(current|next)/consensus-index[.z] . - [The URL above is not implemented as of February 21, 2012. -KL] - The authorities serve another consensus of each flavor "F" from the locations /tor/status-vote/(current|next)/consensus-F.z. and @@ -2302,11 +2261,11 @@ and is fresh until 2:00, that cache will fetch a new consensus at a random time between 2:00 and 2:30.] - Directory caches also fetch the consensus index and the referenced - consensus flavors from the authorities. Caches check the correctness - of consensus flavors, but do not check anything about an unrecognized - consensus document beyond its digest and length. Caches serve all - consensus flavors from the same locations as the directory authorities. + Directory caches also fetch consensus flavors from the authorities. + Caches check the correctness of consensus flavors, but do not check + anything about an unrecognized consensus document beyond its digest and + length. Caches serve all consensus flavors from the same locations as + the directory authorities. 4.4. Downloading and storing router descriptors (authorities and caches) @@ -2368,14 +2327,6 @@ they're about to serve match the right hashes (either the hashes from the fetch URL or the hashes from the consensus, respectively). - [So, with the consensus index, caches can mirror consensus flavors they - don't understand. But there's no such mechanism to mirror unrecognized - descriptor types which might be referenced from those unrecognized - consensus flavors, right? Would it make sense to produce a descriptor - index to tell caches which descriptors to mirror, even if they don't - understand them? Without that, deploying a new consensus flavor might - take the same time as it takes now. -KL] - 4.6. Downloading and storing extra-info documents All authorities, and any cache that chooses to cache extra-info documents, @@ -2499,8 +2450,8 @@ fingerprints. Servers MUST accept both upper and lower case fingerprints in requests. - [XXX Add new URLs for microdescriptors, consensus flavors, - microdescriptor consensus, and consensus indexes. -KL] + [XXX Add new URLs for microdescriptors, consensus flavors, and + microdescriptor consensus. -KL] 5. Client operation: downloading information [View Less]

1 0

[tor/maint-0.2.2] Correct the bulletproofing of routerlist_insert()
by nickm＠torproject.org 16 May '12

16 May '12

commit 3ed4c5dc05a1954a8c68d0f7e9fb802f3155d308 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 10:51:02 2012 -0400 Correct the bulletproofing of routerlist_insert() The original code updated some variables, but forgot to remove a replaced old-routerdesc from rl->old_routers. Related to bug 1776. --- changes/routerlist_ins_replace | 5 +++++ src/or/routerlist.c | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-) … [View More]

1 0

[tor/master] When no usable exit satisfies a predicted port, stop predicting it.
by nickm＠torproject.org 16 May '12

16 May '12

commit 0888c2f8f55037b49fead49091013f2cc7de17c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 12:52:21 2012 -0400 When no usable exit satisfies a predicted port, stop predicting it. Fix for bug 3296. --- changes/bug3296 | 5 +++++ src/or/circuitbuild.c | 4 ++++ src/or/rephist.c | 20 ++++++++++++++++++++ src/or/rephist.h | 1 + 4 files changed, 30 insertions(+), 0 deletions(-) diff --git a/changes/bug3296 b/changes/bug3296 … [View More]new file mode 100644 index 0000000..31c9eac --- /dev/null +++ b/changes/bug3296 @@ -0,0 +1,5 @@ + o Major bugfixes: + - If we are unable to find any exit that supports our predicted + ports, stop calling them predicted, so that we don't loop and + build hopeless circuits indefinitely. Fix for bug 3296; bugfix + on 0.0.9pre6, which introduced predicted ports. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5481838..3b82ed7 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2847,6 +2847,10 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) if (node) break; smartlist_clear(supporting); + /* If we reach this point, we can't actually support any unhandled + * predicted ports, so clear all the remaining ones. */ + if (smartlist_len(needed_ports)) + rep_hist_remove_predicted_ports(needed_ports); } SMARTLIST_FOREACH(needed_ports, uint16_t *, cp, tor_free(cp)); smartlist_free(needed_ports); diff --git a/src/or/rephist.c b/src/or/rephist.c index 0cd60ee..c3f0598 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1868,6 +1868,26 @@ rep_hist_get_predicted_ports(time_t now) return out; } +/** + * Take a list of uint16_t *, and remove every port in the list from the + * current list of predicted ports. + */ +void +rep_hist_remove_predicted_ports(const smartlist_t *rmv_ports) +{ + /* Let's do this on O(N), not O(N^2). */ + bitarray_t *remove_ports = bitarray_init_zero(UINT16_MAX); + SMARTLIST_FOREACH(rmv_ports, const uint16_t *, p, + bitarray_set(remove_ports, *p)); + SMARTLIST_FOREACH_BEGIN(predicted_ports_list, predicted_port_t *, pp) { + if (bitarray_is_set(remove_ports, pp->port)) { + tor_free(pp); + SMARTLIST_DEL_CURRENT(predicted_ports_list, pp); + } + } SMARTLIST_FOREACH_END(pp); + bitarray_free(remove_ports); +} + /** The user asked us to do a resolve. Rather than keeping track of * timings and such of resolves, we fake it for now by treating * it the same way as a connection to port 80. This way we will continue diff --git a/src/or/rephist.h b/src/or/rephist.h index 0a3e46a..800b957 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -49,6 +49,7 @@ const char *rep_hist_get_router_stability_doc(time_t now); void rep_hist_note_used_port(time_t now, uint16_t port); smartlist_t *rep_hist_get_predicted_ports(time_t now); +void rep_hist_remove_predicted_ports(const smartlist_t *rmv_ports); void rep_hist_note_used_resolve(time_t now); void rep_hist_note_used_internal(time_t now, int need_uptime, int need_capacity); [View Less]

1 0

[tor/master] Merge remote-tracking branch 'public/bug3296'
by nickm＠torproject.org 16 May '12

16 May '12

commit ee246bbe95a3adbc86ac8eb3794f55011c2059d5 Merge: 891cf72 0888c2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 10:40:21 2012 -0400 Merge remote-tracking branch 'public/bug3296' changes/bug3296 | 5 +++++ src/or/circuitbuild.c | 4 ++++ src/or/rephist.c | 20 ++++++++++++++++++++ src/or/rephist.h | 1 + 4 files changed, 30 insertions(+), 0 deletions(-)

1 0

[tor/master] When ReloadTorrcOnSIGHUP=1, do non-reload activities anyway
by nickm＠torproject.org 16 May '12

16 May '12

commit b41dd8069f25ef6f6fdb22088291e23e0442476e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 11 14:47:42 2012 -0400 When ReloadTorrcOnSIGHUP=1, do non-reload activities anyway Previously, we skipped everything that got invoked from options_init_from_torrc. But some of the stuff in options_act_reversible and options_act is actually important, like reopening the logs. Now, a SIGHUP always makes the effects of an options_set() happen, … [View More] even though the options haven't changed. Fix for bug 5095; bugfix on 0.2.1.9-alpha, which introduced __ReloadTorrcOnSIGHUP. --- changes/bug5095 | 4 ++++ src/or/config.c | 6 ++++-- src/or/main.c | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug5095 b/changes/bug5095 new file mode 100644 index 0000000..81801ec --- /dev/null +++ b/changes/bug5095 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When we receive a SIGHUP and the controller-use __ReloadTorrcOnSIGHUP + option is set to 0, perform other actions that SIGHUP usually causes + (like reopening the logs). Fixes bug 5095; bugfix on 0.2.1.9-alpha. diff --git a/src/or/config.c b/src/or/config.c index dcc57f8..27aa8a2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -748,7 +748,7 @@ set_options(or_options_t *new_val, char **msg) } /* Issues a CONF_CHANGED event to notify controller of the change. If Tor is * just starting up then the old_options will be undefined. */ - if (old_options) { + if (old_options && old_options != global_options) { elements = smartlist_new(); for (i=0; options_format.vars[i].name; ++i) { const config_var_t *var = &options_format.vars[i]; @@ -774,7 +774,9 @@ set_options(or_options_t *new_val, char **msg) control_event_conf_changed(elements); smartlist_free(elements); } - config_free(&options_format, old_options); + + if (old_options != global_options) + config_free(&options_format, old_options); return 0; } diff --git a/src/or/main.c b/src/or/main.c index 9022f2e..8308b3a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1773,8 +1773,16 @@ do_hup(void) } options = get_options(); /* they have changed now */ } else { + char *msg = NULL; log_notice(LD_GENERAL, "Not reloading config file: the controller told " "us not to."); + /* Make stuff get rescanned, reloaded, etc. */ + if (set_options((or_options_t*)options, &msg) < 0) { + if (!msg) + msg = tor_strdup("Unknown error"); + log_warn(LD_GENERAL, "Unable to re-set previous options: %s", msg); + tor_free(msg); + } } if (authdir_mode_handles_descs(options, -1)) { /* reload the approved-routers file */ [View Less]

1 0

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

16 May '12

commit 891cf72f7103bc5b4de26ac974c0fd42a9d3c88f Merge: d9ceab5 b41dd80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 10:36:30 2012 -0400 Merge branch 'bug5095_squashed' changes/bug5095 | 4 ++++ src/or/config.c | 6 ++++-- src/or/main.c | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix some remaining nmake/msvc build issues
by nickm＠torproject.org 16 May '12

16 May '12

commit d9ceab5bc3611fa6ed4e2f58d38ff26860eeeb3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 10:08:24 2012 -0400 Fix some remaining nmake/msvc build issues --- src/test/Makefile.nmake | 20 ++++++++++++++++++++ src/test/test.c | 3 +++ src/test/test_util.c | 3 +++ src/tools/Makefile.nmake | 19 +++++++++++++++++++ 4 files changed, 45 insertions(+), 0 deletions(-) diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake new file … [View More]mode 100644 index 0000000..aec477c --- /dev/null +++ b/src/test/Makefile.nmake @@ -0,0 +1,20 @@ +all: test.exe + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or + +LIBS = ..\..\..\build-alpha\lib\libevent.lib \ + ..\..\..\build-alpha\lib\libcrypto.lib \ + ..\..\..\build-alpha\lib\libssl.lib \ + ..\..\..\build-alpha\lib\libz.lib \ + ..\or\libtor.lib \ + ws2_32.lib advapi32.lib shell32.lib + +TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \ + test_crypto.obj test_data.obj test_dir.obj test_microdesc.obj \ + test_pt.obj test_util.obj test_config.obj tinytest.obj + +test.exe: $(TEST_OBJECTS) + $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib $(TEST_OBJECTS) + +clean: + del $(TEST_OBJECTS) *.lib test.exe diff --git a/src/test/test.c b/src/test/test.c index 7f196aa..c2dba92 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -71,6 +71,9 @@ int have_failed = 0; /** Temporary directory (set up by setup_directory) under which we store all * our files during testing. */ static char temp_dir[256]; +#ifdef _WIN32 +#define pid_t unsigned +#endif static pid_t temp_dir_setup_in_pid = 0; /** Select and create the temporary directory we'll use to run our unit tests. diff --git a/src/test/test_util.c b/src/test/test_util.c index b5b40bb..d9fc6a3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2263,6 +2263,9 @@ test_util_spawn_background_ok(void *ptr) static void test_util_spawn_background_fail(void *ptr) { +#ifndef BUILDDIR +#define BUILDDIR "." +#endif const char *argv[] = {BUILDDIR "/src/test/no-such-file", "--test", NULL}; const char *expected_err = ""; char expected_out[1024]; diff --git a/src/tools/Makefile.nmake b/src/tools/Makefile.nmake new file mode 100644 index 0000000..a30a28b --- /dev/null +++ b/src/tools/Makefile.nmake @@ -0,0 +1,19 @@ +all: tor-resolve.exe tor-gencert.exe + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or + +LIBS = ..\..\..\build-alpha\lib\libevent.lib \ + ..\..\..\build-alpha\lib\libcrypto.lib \ + ..\..\..\build-alpha\lib\libssl.lib \ + ..\..\..\build-alpha\lib\libz.lib \ + ws2_32.lib advapi32.lib shell32.lib + + +tor-gencert.exe: tor-gencert.obj + $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-gencert.obj + +tor-resolve.exe: tor-resolve.obj + $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-resolve.obj + +clean: + del *.obj *.lib *.exe [View Less]

1 0

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

16 May '12

commit d5ccaa6e2b8c73a1d9d43b82c782c7b10557fe5c Merge: 1150b6b 21e3261 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 09:56:49 2012 -0400 Merge branch 'win32_winnt' changes/bug5861 | 4 ++++ configure.in | 6 ++---- src/common/aes.c | 5 +---- src/common/compat.h | 5 +---- src/common/crypto.c | 5 +---- src/common/tortls.c | 5 +---- src/or/or.h | 5 +---- 7 files changed, 11 insertions(+), 24 deletions(-)

1 0

[tor/master] Remove all instances of WIN32_WINNT (without leading _)
by nickm＠torproject.org 16 May '12

16 May '12

commit 9ffccb3f49e1c73b34c0bd41fd3bc7116afab4b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 13:36:52 2012 -0400 Remove all instances of WIN32_WINNT (without leading _) We started adding it in 59e2c77824840f back in 2004, 8 years and 3 days ago. It's time to deprogram ourselves from this cargo cult. --- configure.in | 2 -- src/common/aes.c | 3 --- src/common/compat.h | 3 --- src/common/crypto.c | 3 --- src/common/tortls.c … [View More]| 3 --- src/or/or.h | 3 --- 6 files changed, 0 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in index f4e0fea..92b7acb 100644 --- a/configure.in +++ b/configure.in @@ -796,7 +796,6 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t], , , #include <sys/socket.h> #endif #ifdef _WIN32 -#define WIN32_WINNT 0x400 #define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) @@ -821,7 +820,6 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #include <sys/socket.h> #endif #ifdef _WIN32 -#define WIN32_WINNT 0x400 #define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/common/aes.c b/src/common/aes.c index a9a0188..692f1bc 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -12,9 +12,6 @@ #include "orconfig.h" #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ - #ifndef WIN32_WINNT - #define WIN32_WINNT 0x400 - #endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif diff --git a/src/common/compat.h b/src/common/compat.h index 65e6cb4..f17aa05 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -9,9 +9,6 @@ #include "orconfig.h" #include "torint.h" #ifdef _WIN32 -#ifndef WIN32_WINNT -#define WIN32_WINNT 0x400 -#endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif diff --git a/src/common/crypto.c b/src/common/crypto.c index e37b282..8b1c9a6 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -13,9 +13,6 @@ #include "orconfig.h" #ifdef _WIN32 -#ifndef WIN32_WINNT -#define WIN32_WINNT 0x400 -#endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif diff --git a/src/common/tortls.c b/src/common/tortls.c index 12d982d..180efa6 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -22,9 +22,6 @@ #include <assert.h> #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ - #ifndef WIN32_WINNT - #define WIN32_WINNT 0x400 - #endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif diff --git a/src/or/or.h b/src/or/or.h index b8fee64..ad0ac6d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -23,9 +23,6 @@ #endif #ifdef _WIN32 -#ifndef WIN32_WINNT -#define WIN32_WINNT 0x400 -#endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif [View Less]

1 0