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

[tlsdate/master] Add some TARGET_DRAGONFLYBSD goo to automake
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit b8cdc77514b0cf540bf32fd8a4c0ca28cd4321b4 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:28:14 2013 -0700 Add some TARGET_DRAGONFLYBSD goo to automake --- src/compat/include.am | 4 ++++ src/include.am | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/compat/include.am b/src/compat/include.am index 4f8cd30..0713c14 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -28,6 +28,10 @@ if TARGET_OPENBSD src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c endif +if TARGET_DRAGONFLYBSD +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +endif + if TARGET_BSD if !TARGET_NETBSD if !TARGET_FREEBSD diff --git a/src/include.am b/src/include.am index 7627850..d00f669 100644 --- a/src/include.am +++ b/src/include.am @@ -70,6 +70,16 @@ check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif +if TARGET_DRAGONFLYBSD +bin_PROGRAMS+= src/tlsdate +bin_PROGRAMS+= src/tlsdate-helper + +src_conf_unittest_SOURCES = src/conf.c +src_conf_unittest_SOURCES+= src/conf-unittest.c +check_PROGRAMS+= src/conf_unittest +noinst_PROGRAMS+= src/conf_unittest +endif + if TARGET_BSD if !TARGET_FREEBSD if !TARGET_NETBSD @@ -203,6 +213,18 @@ noinst_PROGRAMS+= src/proxy-bio_unittest endif endif +if TARGET_DRAGONFLYBSD +if !POLARSSL +src_proxy_bio_unittest_LDADD = @SSL_LIBS@ +src_proxy_bio_unittest_SOURCES = src/proxy-bio.c +src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c +src_proxy_bio_unittest_SOURCES+= src/test-bio.c +src_proxy_bio_unittest_SOURCES+= src/util.c +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif + if TARGET_BSD if !POLARSSL if !TARGET_FREEBSD

1 0

[tlsdate/master] Merge branch 'master' of github.com:ioerror/tlsdate
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit 08b3ae69bc91f8c9d56d470d9d2b147ce77a526c Merge: bddd9e8 1eb63c3 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:04:52 2013 -0700 Merge branch 'master' of github.com:ioerror/tlsdate configure.ac | 19 +++-- src/common/fmemopen-funopen.c | 158 +++++++++++++++++++++++++++++++++++++++++ src/common/fmemopen.h | 8 ++ src/common/strnlen.c | 19 +++++ src/common/strnlen.h | 8 ++ src/conf-unittest.c | 6 ++ src/conf.c | 2 +- src/include.am | 20 +++++ src/proxy-bio.c | 6 ++ src/proxy-polarssl.c | 6 ++ src/tlsdate-helper.c | 2 +- 11 files changed, 245 insertions(+), 9 deletions(-)

1 0

[tlsdate/master] give DragonFly BSD the sacred timespec
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit e74d26cd1fcceb841b448ea7d37c48c6bbaca5b2 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:34:18 2013 -0700 give DragonFly BSD the sacred timespec --- src/compat/clock.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/compat/clock.h b/src/compat/clock.h index adea7ff..2bcdb2e 100644 --- a/src/compat/clock.h +++ b/src/compat/clock.h @@ -30,7 +30,7 @@ #endif struct tlsdate_time { -#if defined(__linux__) || defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) +#if defined(__linux__) || defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__DragonFly__) struct timespec tp; #elif defined(__APPLE__) mach_timespec_t tp;

1 0

[tlsdate/master] Add note about new DragonFly BSD build support; tests pass - users needed for real testing
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit 72940d794bf118fe60618c5cd75a45a8bf2d3e3e Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:46:34 2013 -0700 Add note about new DragonFly BSD build support; tests pass - users needed for real testing --- CHANGELOG | 1 + INSTALL | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f35aefe..fbe7a83 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ and Arch GNU/Linux distros. Add Mac OS X 10.8.3 support Extensive setup/install documentation is now present in INSTALL for most OSes + Add DragonFly BSD 3.3 support 0.0.6 Mon 18 Feb, 2013 Ensure that tlsdate compiles with g++ by explicit casting rather than implicit casting by whatever compiler is compiling tlsdate. diff --git a/INSTALL b/INSTALL index 5ac7418..2b01a65 100644 --- a/INSTALL +++ b/INSTALL @@ -14,6 +14,7 @@ tlsdate should build and work on the following Operating Systems: NetBSD 6.0.1 OpenBSD 5.2 Gentoo 20130413 + DragonFly BSD 3.3-DEVELOPMENT Please file a bug or email the tlsdate team if you have successfully built or use tlsdate on a platform that is not listed. We are specifically looking for @@ -22,7 +23,6 @@ ports of tlsdate or for tlsdate integration on the following Operating Systems: Win32 (MinGW or otherwise) OpenWRT pfsense - DragonFly BSD OpenVMS Currently porting is in progress or partially documented for:

1 0

[tlsdate/master] Finish port of tlsdate to DragonFly BSD; tested on 3.3-DEVELOPMENT
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit 88266c5cbbeb3ed9e284913d004bfdf78581a8b3 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:45:22 2013 -0700 Finish port of tlsdate to DragonFly BSD; tested on 3.3-DEVELOPMENT --- src/conf.c | 4 ++++ src/include.am | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/conf.c b/src/conf.c index b093676..607f523 100644 --- a/src/conf.c +++ b/src/conf.c @@ -19,6 +19,10 @@ #include "src/common/android.h" // XXX: Dirty hack - make this more generic later #endif +#ifdef TARGET_OS_DRAGONFLYBSD +#include "src/common/android.h" // XXX: Dirty hack - make this more generic later +#endif + #ifdef HAVE_ANDROID #include "src/common/android.h" #endif diff --git a/src/include.am b/src/include.am index d00f669..58e0df0 100644 --- a/src/include.am +++ b/src/include.am @@ -76,6 +76,7 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c +src_conf_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -220,6 +221,7 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c +src_proxy_bio_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest endif

1 0

[tor/master] Add a boolean to flag-thresholds for "we have enough measured bandwidth"
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit b933360ee848873db6c051eabe5aecd01b3f67a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 22:43:52 2013 -0400 Add a boolean to flag-thresholds for "we have enough measured bandwidth" Implements #8711. --- changes/bug8711 | 6 ++++++ src/or/dirserv.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/bug8711 b/changes/bug8711 new file mode 100644 index 0000000..28a1daa --- /dev/null +++ b/changes/bug8711 @@ -0,0 +1,6 @@ + o Minor features (authority): + - Add a "ignoring-advertised-bws" boolean to our flag-thresholds + lines to describe whether we have enough measured bandwidths to + ignore advertised bandwidth claims. Closes ticket 8711. + + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 3755720..66a2c14 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2273,12 +2273,16 @@ char * dirserv_get_flag_thresholds_line(void) { char *result=NULL; + const int measured_threshold = + get_options()->MinMeasuredBWsForAuthToIgnoreAdvertised; + const int enough_measured_bw = routers_with_measured_bw > measured_threshold; + tor_asprintf(&result, "stable-uptime=%lu stable-mtbf=%lu " "fast-speed=%lu " "guard-wfu=%.03f%% guard-tk=%lu " "guard-bw-inc-exits=%lu guard-bw-exc-exits=%lu " - "enough-mtbf=%d", + "enough-mtbf=%d ignoring-advertised-bws=%d", (unsigned long)stable_uptime, (unsigned long)stable_mtbf, (unsigned long)fast_bandwidth_kb*1000, @@ -2286,7 +2290,8 @@ dirserv_get_flag_thresholds_line(void) (unsigned long)guard_tk, (unsigned long)guard_bandwidth_including_exits_kb*1000, (unsigned long)guard_bandwidth_excluding_exits_kb*1000, - enough_mtbf_info ? 1 : 0); + enough_mtbf_info ? 1 : 0, + enough_measured_bw ? 1 : 0); return result; }

1 0

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

19 Apr '13

commit 6defb10d723211b5a0830a408bd33863fd33872f Merge: 0124b10 b933360 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 22:45:12 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8711 | 6 ++++++ src/or/dirserv.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[torspec/master] Describe new flag for ticket #8711
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit 6d29935d15e89dcaada629b8db53e57f6f911a59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 22:44:50 2013 -0400 Describe new flag for ticket #8711 Implemented in tor in b933360ee848873db6c051eabe5aecd01b3f67a3 --- dir-spec.txt | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 5a84250..029454d 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1270,6 +1270,10 @@ "guard-bw-exc-exits" -- If exits can't be guards, then all guards guards must have a bandwidth this high. + "ignoring-advertised-bws" -- 1 if we have enough measured bandwidths + that we'll ignore the advertised bandwidth + claims of routers without measured bandwidth. + "fresh-until" SP YYYY-MM-DD SP HH:MM:SS NL [Exactly once.]

1 0

[tor/maint-0.2.4] Add a boolean to flag-thresholds for "we have enough measured bandwidth"
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit b933360ee848873db6c051eabe5aecd01b3f67a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 22:43:52 2013 -0400 Add a boolean to flag-thresholds for "we have enough measured bandwidth" Implements #8711. --- changes/bug8711 | 6 ++++++ src/or/dirserv.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/bug8711 b/changes/bug8711 new file mode 100644 index 0000000..28a1daa --- /dev/null +++ b/changes/bug8711 @@ -0,0 +1,6 @@ + o Minor features (authority): + - Add a "ignoring-advertised-bws" boolean to our flag-thresholds + lines to describe whether we have enough measured bandwidths to + ignore advertised bandwidth claims. Closes ticket 8711. + + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 3755720..66a2c14 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2273,12 +2273,16 @@ char * dirserv_get_flag_thresholds_line(void) { char *result=NULL; + const int measured_threshold = + get_options()->MinMeasuredBWsForAuthToIgnoreAdvertised; + const int enough_measured_bw = routers_with_measured_bw > measured_threshold; + tor_asprintf(&result, "stable-uptime=%lu stable-mtbf=%lu " "fast-speed=%lu " "guard-wfu=%.03f%% guard-tk=%lu " "guard-bw-inc-exits=%lu guard-bw-exc-exits=%lu " - "enough-mtbf=%d", + "enough-mtbf=%d ignoring-advertised-bws=%d", (unsigned long)stable_uptime, (unsigned long)stable_mtbf, (unsigned long)fast_bandwidth_kb*1000, @@ -2286,7 +2290,8 @@ dirserv_get_flag_thresholds_line(void) (unsigned long)guard_tk, (unsigned long)guard_bandwidth_including_exits_kb*1000, (unsigned long)guard_bandwidth_excluding_exits_kb*1000, - enough_mtbf_info ? 1 : 0); + enough_mtbf_info ? 1 : 0, + enough_measured_bw ? 1 : 0); return result; }

1 0

[tor/master] Turn on ntor by default client-side
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit 0124b10d2850c42e61a4ba65f61af579b47f425b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 22:35:15 2013 -0400 Turn on ntor by default client-side Implements #8561. --- changes/bug8561 | 3 +++ doc/tor.1.txt | 4 ++-- src/or/config.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug8561 b/changes/bug8561 new file mode 100644 index 0000000..598071a --- /dev/null +++ b/changes/bug8561 @@ -0,0 +1,3 @@ + o Major features: + - The ntor handshake is now on-by-default, no matter what the + directory authorities recommend. Implements ticket 8561. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index adcf6b7..0a6f8f5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1253,9 +1253,9 @@ The following options are useful only for clients (that is, if it too early might make your client stand out. If this option is 0, your Tor client won't use the ntor handshake. If it's 1, your Tor client will use the ntor handshake to extend circuits through servers that - support it. If this option is "auto" (recommended), then your client + support it. If this option is "auto", then your client will use the ntor handshake once enough directory authorities recommend - it. (Default: auto) + it. (Default: 1) **PathBiasCircThreshold** __NUM__ + diff --git a/src/or/config.c b/src/or/config.c index cd9acf4..c57feaf 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -404,7 +404,7 @@ static config_var_t option_vars_[] = { V(UseEntryGuards, BOOL, "1"), V(UseEntryGuardsAsDirGuards, BOOL, "1"), V(UseMicrodescriptors, AUTOBOOL, "auto"), - V(UseNTorHandshake, AUTOBOOL, "auto"), + V(UseNTorHandshake, AUTOBOOL, "1"), V(User, STRING, NULL), V(UserspaceIOCPBuffers, BOOL, "0"), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"),

1 0