tor-commits

tor-commits@lists.torproject.org

1 participants
212989 discussions

[torsocks/master] Clean up and comment configure.in
by hoganrobert＠torproject.org 25 Feb '11

25 Feb '11

commit 16dbf7bdf456cd27f36d036da11aa8b3dda3b22b Author: Robert Hogan <robert(a)roberthogan.net> Date: Thu Feb 24 20:52:23 2011 +0000 Clean up and comment configure.in --- configure.in | 169 ++++++++++++++++++++++++++++++--------------------------- 1 files changed, 89 insertions(+), 80 deletions(-) diff --git a/configure.in b/configure.in index 113b09b..f74a3fd 100644 --- a/configure.in +++ b/configure.in @@ -1,17 +1,23 @@ -dnl Process this file with autoconf to produce a configure script. +############################################################################## +# 1. Initialize the autoconf build +############################################################################## + +# Process this file with autoconf to produce a configure script. AC_INIT() + +# Create a config.g file to store defines generated by configure AC_CONFIG_HEADER(config.h) +# Automake initialization AM_INIT_AUTOMAKE(torsocks, 0.1) -dnl Our default prefix is /usr/ since most people will be using torsocks -dnl on Linux systems and that /usr/local/ stuff annoys them -dnl AC_PREFIX_DEFAULT(/usr) +# Get hostname and other information. +AC_CANONICAL_HOST +dnl Checks for programs. +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_LN_S -dnl if libdir hasn't been set by the user default it to /lib since -dnl torsocks needs to be on the root partition if put in the -dnl /etc/ld.so.preload file -dnl test "$libdir" = "\${exec_prefix}/lib" && libdir="/lib" dnl Arguments we allow AC_ARG_ENABLE(debug, @@ -21,15 +27,10 @@ AC_ARG_ENABLE(oldmethod, AC_ARG_ENABLE(envconf, [ --disable-envconf do not allow TORSOCKS_CONF_FILE to specify configuration file ]) -dnl ----------------------------------- -dnl Get hostname and other information. -dnl ----------------------------------- -AC_CANONICAL_HOST -dnl Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S +############################################################################## +# 2. Check for some standard headers and libraries +############################################################################## dnl Check if the C compiler accepts -Wall AC_MSG_CHECKING(if the C compiler accepts -Wall) @@ -67,9 +68,12 @@ dnl Checks for library functions. AC_CHECK_FUNCS(strcspn strdup strerror strspn strtol mmap strcasecmp \ strncasecmp strtol,,[AC_MSG_ERROR("Required function not found")]) -dnl Find which version of gethostbyname_r we should be using (actually this -dnl isn't used right now). -dnl AX_FUNC_WHICH_GETHOSTBYNAME_R +############################################################################## +# 3. Determine libraries we need to include when linking libtorsocks. +# OpenBSD and OSX have some special requirements here. +# Also check the host we're building on, as some of the code +# in torsocks.c and elsewhere is platform-dependent. +############################################################################## dnl First find the library that contains connect() (obviously dnl the most important library for us). Once we've found it @@ -90,6 +94,7 @@ if test "${CONNECTLIB}" = ""; then AC_MSG_ERROR('Could not find library containing connect()') fi + dnl Check for socket AC_CHECK_FUNC(socket,, [ AC_CHECK_LIB(socket, socket,,AC_MSG_ERROR("socket function not found"))]) @@ -102,43 +107,49 @@ AC_CHECK_FUNC(inet_aton, AC_DEFINE([HAVE_INET_ATON],[],[Description]), [ LIBS="${LIBS} -lnsl" ], [ AC_MSG_ERROR("Neither inet_aton or inet_addr present")])])]) + dnl Look for gethostbyname (needed by torsocks) AC_CHECK_FUNC(gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ AC_CHECK_LIB(xnet, gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ AC_MSG_ERROR(["gethostbyname not found, name lookups in " \ "torsocks disabled"])])]) -dnl The simple programs (saveme and inspectsocks) have no further -dnl requirements, so save the libs needed here and use them in the -dnl Makefile -SIMPLELIBS=${LIBS} -LIBS= -dnl Checks for libraries. -dnl Replace `main' with a function in -ldl: +dnl Our main libs to link against are -dl and -lresolv. +AC_SEARCH_LIBS(dlopen, [c dl]) +# Required to compile on machines that export res_query with a double underscore. +# Sourced from gnupg configure via cvsnt. +AC_SEARCH_LIBS(res_query,resolv bind,,AC_SEARCH_LIBS(__res_query,resolv bind)) +AC_DEFINE([SUPPORT_RES_API],[],[Support the res_query family of calls]) -AC_CHECK_LIB(dl, dlsym, [ tempdso="yes" ],tempdso="no") -if test "$tempdso" = "no"; then - AC_CHECK_LIB(c, dlsym,,AC_MSG_ERROR("dlsym() not found in libc or libdl." \ - "Check your system for libc.so and/or libdl.so.")) -fi -AC_CHECK_FUNC(res_query, , - [AC_CHECK_LIB(resolv, res_query, [], - [ save_libs="$LIBS" - LIBS="-lresolv $LIBS" - AC_MSG_CHECKING([for res_query in -lresolv (alternate version)]) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include <resolv.h>]], [[res_query(0,0,0,0,0)]])], - [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no) - LIBS="$save_libs" - AC_CHECK_LIB(resolv, res_query, - [], [ AC_MSG_ERROR(res_query not found in libc or libresolve. Check your system for libc.so and/or libresolve.so.) ] ) ] ) ] ) - ] -) +dnl OpenBSD needs -lpthread. It also doesn't support AI_V4MAPPED. +case $host in +*-*-openbsd*) + AC_DEFINE(OPENBSD, 1, "Define to handle OpenBSD") + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) + ;; +*-*-freebsd*) + AC_DEFINE(FREEBSD, 1, "Define to handle FreeBSD") + ;; +*-*-darwin*) + dnl Needed to compile tests. + dnl See https://bugs.g10code.com/gnupg/issue1292: + dnl "On OS X (at least in 10.6 and I believe starting at 10.3) the DNS resolution + dnl services fail to compile. This is a result of the addition of BIND9 compatible + dnl resolution libraries on OS X that are being picked up by the configure script + dnl instead of -lresolv causing the tests for useable resolution services to fail + dnl thus disabling features like pka auto lookup." + LIBS="-lresolv $LIBS" + ;; +esac -AC_DEFINE([SUPPORT_RES_API],[],[Support the res_query family of calls]) + +############################################################################## +# 3. Check if we need to use --enable-oldmethod, regardless of what was +# given on the ./configure command line. +############################################################################## dnl If we're using gcc here define _GNU_SOURCE AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h) @@ -174,6 +185,10 @@ if test "x${enable_envconf}" = "x"; then AC_DEFINE([ALLOW_ENV_CONFIG],[],[Description]) fi +############################################################################## +# 3. If --enable-oldmethod was requested, perform the necessary checks +############################################################################## + if test "${enable_oldmethod}" = "yes"; then AC_DEFINE([USE_OLD_DLSYM],[],[Description]) oldmethod="yes" @@ -248,7 +263,16 @@ if test "${oldmethod}" = "yes"; then AC_MSG_RESULT($LIBC) fi -dnl Find the correct select prototype on this machine +############################################################################## +# 4. Get the signatures for each of the functions we are going +# to override in torsocks. These are: +# connect, poll, select, close, getpeername, res_query, +# res_init, res_send, res_querydomain, gethostbyname, +# gethostbyaddr, getaddrinfo, getipnodebyname, sendto, +# sendmsg +############################################################################## + +dnl Find the correct select prototype on this machine AC_MSG_CHECKING(for correct select prototype) PROTO= NAMES='n, readfds, writefds, exceptfds, timeout' @@ -270,7 +294,8 @@ AC_MSG_RESULT([select(${PROTO})]) AC_DEFINE_UNQUOTED([SELECT_SIGNATURE],[${PROTO}],[Description]) AC_DEFINE_UNQUOTED([SELECT_ARGNAMES],[${NAMES}],[Argument names]) -dnl Find the correct connect prototype on this machine + +dnl Find the correct connect prototype on this machine AC_MSG_CHECKING(for correct connect prototype) PROTO= NAMES='__fd, __addr, __len' @@ -353,6 +378,7 @@ AC_MSG_RESULT([res_querydomain(${PROTO})]) AC_DEFINE_UNQUOTED([RES_QUERYDOMAIN_SIGNATURE], [${PROTO}],[Description]) AC_DEFINE_UNQUOTED([RES_QUERYDOMAIN_ARGNAMES],[${NAMES}],[Argument names]) + dnl Find the correct res_send prototype on this machine AC_MSG_CHECKING(for correct res_send prototype) PROTO= @@ -513,15 +539,12 @@ NAMES='s, msg, flags' AC_DEFINE_UNQUOTED(SENDMSG_SIGNATURE, [${PROTO}], [Description]) AC_DEFINE_UNQUOTED([SENDMSG_ARGNAMES],[${NAMES}],[Argument names]) -dnl Output the special librarys (libdl etc needed for torsocks) -SPECIALLIBS=${LIBS} -AC_SUBST(SPECIALLIBS) -LIBS=${SIMPLELIBS} -AC_SEARCH_LIBS(dlopen, [dl]) -# Required to compile on machines that export res_query with a double underscore. -# Sourced from gnupg configure via cvsnt. -AC_SEARCH_LIBS(res_query,resolv bind,,AC_SEARCH_LIBS(__res_query,resolv bind)) +############################################################################## +# 5. Determine how to preload libtorsocks.so on this system. +# On Linux this is with the LD_PRELOAD variable, on OSX +# we need to use DYLD_INSERT_LIBRARIES. +############################################################################## TESTLDFLAGS="$LDFLAGS" @@ -569,32 +592,13 @@ darwin*) ;; esac -dnl OpenBSD needs -lpthread. It also doesn't support AI_V4MAPPED. -case $host in -*-*-openbsd*) - AC_DEFINE(OPENBSD, 1, "Define to handle OpenBSD") - AC_SEARCH_LIBS(pthread_create, [pthread]) - AC_SEARCH_LIBS(pthread_detach, [pthread]) - ;; -*-*-freebsd*) - AC_DEFINE(FREEBSD, 1, "Define to handle FreeBSD") - ;; -*-*-darwin*) - dnl Needed to compile tests. - dnl See https://bugs.g10code.com/gnupg/issue1292: - dnl "On OS X (at least in 10.6 and I believe starting at 10.3) the DNS resolution - dnl services fail to compile. This is a result of the addition of BIND9 compatible - dnl resolution libraries on OS X that are being picked up by the configure script - dnl instead of -lresolv causing the tests for useable resolution services to fail - dnl thus disabling features like pka auto lookup." - LIBS="-lresolv $LIBS" - ;; -esac - AC_SUBST(SHLIB_EXT) AC_SUBST(LD_PRELOAD) - +############################################################################## +# 7. Determine where the install should write the default configuration +# file and where libtorsocks should read it from by default. +############################################################################## if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -618,9 +622,12 @@ fi AC_DEFINE_UNQUOTED([CONF_FILE], ["${CONFDIR}/torsocks.conf"],[Description]) ]) +############################################################################## +# 8. Clean up and create some supporting scripts from their *.in files +############################################################################## + AC_LANG_C AC_PROG_CC - AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) @@ -629,8 +636,10 @@ AC_ENABLE_STATIC AC_CONFIG_FILES([src/usewithtor src/torsocks src/torsocks.conf.5 src/torsocks.8 src/usewithtor.1 src/torsocks.1]) +dnl Output the Makefile for libtorsocks AC_OUTPUT(Makefile src/Makefile) +dnl Output the Makefile for test/test_torsocks. dnl Dump any LDFLAGS that were only required for linking libtorsocks, such as -dynamiclib on OSX. LDFLAGS="$TESTLDFLAGS" AC_OUTPUT(test/Makefile)

1 0

[tor/release-0.2.2] Remove doc/spec/Makefile.in from list of generated files
by arma＠torproject.org 25 Feb '11

25 Feb '11

commit 10ad3442e11fb5a54c19eef7425bc317a9cc0969 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 17:51:03 2011 -0500 Remove doc/spec/Makefile.in from list of generated files --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 68c593a..7cdb330 100644 --- a/configure.in +++ b/configure.in @@ -866,7 +866,7 @@ fi CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib" -AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) +AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) AC_OUTPUT if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then

1 0

[tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 25 Feb '11

25 Feb '11

commit 596f7a39b69c5c3c5f2427e65056af6cc2bb0f64 Merge: 06deec1 10ad344 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 17:53:09 2011 -0500 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: configure.in configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --combined configure.in index 9cbfbb1,7cdb330..f30402d --- a/configure.in +++ b/configure.in @@@ -1,10 -1,11 +1,10 @@@ -dnl $Id$ dnl Copyright (c) 2001-2004, Roger Dingledine dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.25) +AM_INIT_AUTOMAKE(tor, 0.2.2.19-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST @@@ -19,6 -20,21 +19,6 @@@ f # the += operator on it in src/or/Makefile.am CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src/common" -AC_ARG_ENABLE(debug, - AS_HELP_STRING(--enable-debug, compile with debugging info), -[if test x$enableval = xyes; then - CFLAGS="$CFLAGS -g" -fi]) - -#XXXX ideally, we should make this into a no-op, and detect whether we're -#compiling for the iphone by using $target. -AC_ARG_ENABLE(iphone, - AS_HELP_STRING(--enable-iphone, compile with iPhone support), - [if test x$enableval = xyes ; then - tor_cv_iphone=true - CFLAGS="$CFLAGS -D__DARWIN_UNIX03 -DIPHONE" - fi]) - #XXXX020 We should make these enabled or not, before 0.2.0.x-final AC_ARG_ENABLE(buf-freelists, AS_HELP_STRING(--disable-buf-freelists, disable freelists for buffer RAM)) @@@ -30,8 -46,6 +30,8 @@@ AC_ARG_ENABLE(static-openssl AS_HELP_STRING(--enable-static-openssl, Link against a static openssl library. Requires --with-openssl-dir)) AC_ARG_ENABLE(static-libevent, AS_HELP_STRING(--enable-static-libevent, Link against a static libevent library. Requires --with-libevent-dir)) +AC_ARG_ENABLE(static-zlib, + AS_HELP_STRING(--enable-static-zlib, Link against a static zlib library. Requires --with-zlib-dir)) if test x$enable_buf_freelists != xno; then AC_DEFINE(ENABLE_BUF_FREELISTS, 1, @@@ -51,15 -65,6 +51,15 @@@ AC_ARG_ENABLE(transparent *) AC_MSG_ERROR(bad value for --enable-transparent) ;; esac], [transparent=true]) +AC_ARG_ENABLE(asciidoc, + AS_HELP_STRING(--disable-asciidoc, don't use asciidoc (disables building of manpages)), + [case "${enableval}" in + yes) asciidoc=true ;; + no) asciidoc=false ;; + *) AC_MSG_ERROR(bad value for --disable-asciidoc) ;; + esac], [asciidoc=true]) + + AC_ARG_ENABLE(threads, AS_HELP_STRING(--disable-threads, disable multi-threading support)) @@@ -85,32 -90,18 +85,32 @@@ case $host i ;; esac -AC_ARG_ENABLE(geoip-stats, - AS_HELP_STRING(--enable-geoip-stats, enable code for directories to collect per-country statistics)) - -if test "$enable_geoip_stats" = "yes"; then - AC_DEFINE(ENABLE_GEOIP_STATS, 1, [Defined if we try to collect per-country statistics]) -fi - AC_ARG_ENABLE(gcc-warnings, AS_HELP_STRING(--enable-gcc-warnings, enable verbose warnings)) AC_ARG_ENABLE(gcc-warnings-advisory, AS_HELP_STRING(--enable-gcc-warnings-advisory, [enable verbose warnings, excluding -Werror])) +dnl Adam shostack suggests the following for Windows: +dnl -D_FORTIFY_SOURCE=2 -fstack-protector-all +dnl Others suggest '/gs /safeseh /nxcompat /dynamicbase' for non-gcc on Windows +dnl This requires that we use gcc and that we add -O2 to the CFLAGS. +AC_ARG_ENABLE(gcc-hardening, + AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks), +[if test x$enableval = xyes; then + CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all" + CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector" + CFLAGS="$CFLAGS --param ssp-buffer-size=1" + LDFLAGS="$LDFLAGS -pie" +fi]) + +dnl Linker hardening options +dnl Currently these options are ELF specific - you can't use this with MacOSX +AC_ARG_ENABLE(linker-hardening, + AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups), +[if test x$enableval = xyes; then + LDFLAGS="$LDFLAGS -z relro -z now" +fi]) + AC_ARG_ENABLE(local-appdata, AS_HELP_STRING(--enable-local-appdata, default to host local application data paths on Windows)) if test "$enable_local_appdata" = "yes"; then @@@ -123,18 -114,6 +123,18 @@@ AC_PROG_CP AC_PROG_MAKE_SET AC_PROG_RANLIB +dnl autoconf 2.59 appears not to support AC_PROG_SED +AC_CHECK_PROG([SED],[sed],[sed],[/bin/false]) + +dnl check for asciidoc and a2x +AC_PATH_PROG([ASCIIDOC], [asciidoc], none) +AC_PATH_PROG([A2X], [a2x], none) + +AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue) + +AC_PATH_PROG([SHA1SUM], [sha1sum], none) +AC_PATH_PROG([OPENSSL], [openssl], none) + TORUSER=_tor AC_ARG_WITH(tor-user, [ --with-tor-user=NAME Specify username for tor daemon ], @@@ -156,7 -135,7 +156,7 @@@ AC_SUBST(TORGROUP dnl If WIN32 is defined and non-zero, we are building for win32 AC_MSG_CHECKING([for win32]) -AC_RUN_IFELSE([ +AC_RUN_IFELSE([AC_LANG_SOURCE([ int main(int c, char **v) { #ifdef WIN32 #if WIN32 @@@ -167,7 -146,7 +167,7 @@@ #else return 2; #endif -}], +}])], bwin32=true; AC_MSG_RESULT([yes]), bwin32=false; AC_MSG_RESULT([no]), bwin32=cross; AC_MSG_RESULT([cross]) @@@ -175,14 -154,14 +175,14 @@@ if test "$bwin32" = cross; then AC_MSG_CHECKING([for win32 (cross)]) -AC_COMPILE_IFELSE([ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #ifdef WIN32 int main(int c, char **v) {return 0;} #else #error int main(int c, char **v) {return x(y);} #endif -], +])], bwin32=true; AC_MSG_RESULT([yes]), bwin32=false; AC_MSG_RESULT([no])) fi @@@ -194,12 -173,12 +194,12 @@@ AM_CONDITIONAL(BUILD_NT_SERVICES, test dnl Enable C99 when compiling with MIPSpro AC_MSG_CHECKING([for MIPSpro compiler]) -AC_COMPILE_IFELSE(AC_LANG_PROGRAM(, [ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [ #if (defined(__sgi) && defined(_COMPILER_VERSION)) #error return x(y); #endif -]), +])], bmipspro=false; AC_MSG_RESULT(no), bmipspro=true; AC_MSG_RESULT(yes)) @@@ -223,7 -202,7 +223,7 @@@ dnl ----------------------------------- dnl Check for functions before libevent, since libevent-1.2 apparently dnl exports strlcpy without defining it in a header. -AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull getaddrinfo localtime_r gmtime_r memmem strtok_r writev readv flock prctl) +AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull getaddrinfo localtime_r gmtime_r memmem strtok_r writev readv flock prctl vasprintf) using_custom_malloc=no if test x$enable_openbsd_malloc = xyes ; then @@@ -297,20 -276,15 +297,20 @@@ save_CPPFLAGS="$CPPFLAGS LIBS="-levent $TOR_LIB_WS32 $LIBS" LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS" CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS" -AC_CHECK_FUNCS(event_get_version event_get_method event_set_log_callback) +AC_CHECK_FUNCS(event_get_version event_get_version_number event_get_method event_set_log_callback evdns_set_outgoing_bind_address event_base_loopexit) AC_CHECK_MEMBERS([struct event.min_heap_idx], , , [#include <event.h> ]) +AC_CHECK_HEADERS(event2/event.h event2/dns.h) + LIBS="$save_LIBS" LDFLAGS="$save_LDFLAGS" CPPFLAGS="$save_CPPFLAGS" + +AM_CONDITIONAL(USE_EXTERNAL_EVDNS, test x$ac_cv_header_event2_dns_h = xyes) + if test "$enable_static_libevent" = "yes"; then if test "$tor_cv_library_libevent_dir" = "(system)"; then AC_MSG_ERROR("You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent") @@@ -322,7 -296,6 +322,7 @@@ els fi AC_SUBST(TOR_LIBEVENT_LIBS) + dnl ------------------------------------------------------ dnl Where do you live, openssl? And how do we call you? @@@ -374,19 -347,6 +374,19 @@@ TOR_SEARCH_LIBRARY(zlib, $tryzlibdir, [ [zlibVersion(); exit(0);], [--with-zlib-dir], [/opt/zlib]) +if test "$enable_static_zlib" = "yes"; then + if test "$tor_cv_library_zlib_dir" = "(system)"; then + AC_MSG_ERROR("You must specify an explicit --with-zlib-dir=x option when + using --enable-static-zlib") + else + TOR_ZLIB_LIBS="$TOR_LIBDIR_zlib/libz.a" + echo "$TOR_LIBDIR_zlib/libz.a" + fi +else + TOR_ZLIB_LIBS="-lz" +fi +AC_SUBST(TOR_ZLIB_LIBS) + dnl Make sure to enable support for large off_t if available. AC_SYS_LARGEFILE @@@ -565,7 -525,7 +565,7 @@@ AC_CHECK_TYPES([rlim_t], , ]) AC_CACHE_CHECK([whether time_t is signed], tor_cv_time_t_signed, [ -AC_RUN_IFELSE(AC_LANG_SOURCE([ +AC_RUN_IFELSE([AC_LANG_SOURCE([ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@@ -575,7 -535,7 +575,7 @@@ #ifdef HAVE_TIME_H #include <time.h> #endif -int main(int c, char**v) { if (((time_t)-1)<0) return 1; else return 0; }]), +int main(int c, char**v) { if (((time_t)-1)<0) return 1; else return 0; }])], tor_cv_time_t_signed=no, tor_cv_time_t_signed=yes, tor_cv_time_t_signed=cross) ]) @@@ -588,23 -548,6 +588,23 @@@ if test "$tor_cv_time_t_signed" != no; [Define to 1 iff time_t is signed]) fi +AC_CACHE_CHECK([whether size_t is signed], tor_cv_size_t_signed, [ +AC_RUN_IFELSE([AC_LANG_SOURCE([ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +int main(int c, char**v) { if (((size_t)-1)<0) return 1; else return 0; }])], + tor_cv_size_t_signed=no, tor_cv_size_t_signed=yes, tor_cv_size_t_signed=cross) +]) + +if test "$tor_cv_size_t_signed" = cross; then + AC_MSG_NOTICE([Cross compiling: assuming that size_t is not signed.]) +fi + +if test "$tor_cv_size_t_signed" = yes; then + AC_MSG_ERROR([You have a signed size_t; that's grossly nonconformant.]) +fi + AC_CHECK_SIZEOF(socklen_t, , [AC_INCLUDES_DEFAULT() #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> @@@ -712,16 -655,6 +712,16 @@@ if test x$tcmalloc = xyes ; the LDFLAGS="-ltcmalloc $LDFLAGS" fi +# By default, we're going to assume we don't have mlockall() +# bionic and other platforms have various broken mlockall subsystems. +# Some systems don't have a working mlockall, some aren't linkable, +# and some have it but don't declare it. +AC_CHECK_FUNCS(mlockall) +AC_CHECK_DECLS([mlockall], , , [ +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> +#endif]) + # Allow user to specify an alternate syslog facility AC_ARG_WITH(syslog-facility, [ --with-syslog-facility=LOG syslog facility to use (default=LOG_DAEMON)], @@@ -741,14 -674,14 +741,14 @@@ AC_CHECK_FUNC(gethostbyname_r, AC_MSG_CHECKING([how many arguments gethostbyname_r() wants]) OLD_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS" - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <netdb.h> ], [[ char *cp1, *cp2; struct hostent *h1, *h2; int i1, i2; (void)gethostbyname_r(cp1,h1,cp2,i1,&h2,&i2); - ]]),[ + ]])],[ AC_DEFINE(HAVE_GETHOSTBYNAME_R) AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARG, 1, [Define this if gethostbyname_r takes 6 arguments]) @@@ -789,25 -722,25 +789,25 @@@ AC_CACHE_CHECK([whether the C compiler supports __func__], tor_cv_have_func_macro, - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <stdio.h> -int main(int c, char **v) { puts(__func__); }], +int main(int c, char **v) { puts(__func__); }])], tor_cv_have_func_macro=yes, tor_cv_have_func_macro=no)) AC_CACHE_CHECK([whether the C compiler supports __FUNC__], tor_cv_have_FUNC_macro, - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <stdio.h> -int main(int c, char **v) { puts(__FUNC__); }], +int main(int c, char **v) { puts(__FUNC__); }])], tor_cv_have_FUNC_macro=yes, tor_cv_have_FUNC_macro=no)) AC_CACHE_CHECK([whether the C compiler supports __FUNCTION__], tor_cv_have_FUNCTION_macro, - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <stdio.h> -int main(int c, char **v) { puts(__FUNCTION__); }], +int main(int c, char **v) { puts(__FUNCTION__); }])], tor_cv_have_FUNCTION_macro=yes, tor_cv_have_FUNCTION_macro=no)) @@@ -848,20 -781,6 +848,20 @@@ AC_SUBST(BINDIR LOCALSTATEDIR=`eval echo $localstatedir` AC_SUBST(LOCALSTATEDIR) +if test "$bwin32" = true; then + # Test if the linker supports the --nxcompat and --dynamicbase options + # for Windows + save_LDFLAGS="$LDFLAGS" + LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" + AC_MSG_CHECKING([whether the linker supports DllCharacteristics]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([])], + [AC_MSG_RESULT([yes])] + [save_LDFLAGS="$save_LDFLAGS $LDFLAGS"], + [AC_MSG_RESULT([no])] + ) + LDFLAGS="$save_LDFLAGS" +fi + # Set CFLAGS _after_ all the above checks, since our warnings are stricter # than autoconf's macros like. if test "$GCC" = yes; then @@@ -879,24 -798,24 +879,24 @@@ f # released versions. (Some relevant gcc versions can't handle these.) if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xyes; then - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ #if !defined(__GNUC__) || (__GNUC__ < 4) #error -#endif]), have_gcc4=yes, have_gcc4=no) +#endif])], have_gcc4=yes, have_gcc4=no) - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ #if !defined(__GNUC__) || (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 2) #error -#endif]), have_gcc42=yes, have_gcc42=no) +#endif])], have_gcc42=yes, have_gcc42=no) - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ #if !defined(__GNUC__) || (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) #error -#endif]), have_gcc43=yes, have_gcc43=no) +#endif])], have_gcc43=yes, have_gcc43=no) save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wshorten-64-to-32" - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], []), have_shorten64_flag=yes, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], have_shorten64_flag=yes, have_shorten64_flag=no) CFLAGS="$save_CFLAGS" @@@ -923,6 -842,7 +923,6 @@@ if test x$have_gcc42 = xyes ; then # These warnings break gcc 4.0.2 and work on gcc 4.2 - # XXXX020 Use -fstack-protector. # XXXX020 See if any of these work with earlier versions. CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -Wstrict-overflow=1" # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3. @@@ -946,7 -866,7 +946,7 @@@ f CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib" - AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) -AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) ++AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) AC_OUTPUT if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then

1 0

[tor/release-0.2.2] prevent same entry and exit for insane edge case
by arma＠torproject.org 25 Feb '11

25 Feb '11

commit a2727f62494b8a56152214017ac8fb348dd064be Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 17:54:25 2011 -0500 prevent same entry and exit for insane edge case --- changes/bug2403 | 6 ++++++ src/or/circuitbuild.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug2403 b/changes/bug2403 new file mode 100644 index 0000000..3b29b37 --- /dev/null +++ b/changes/bug2403 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - In the special case where you configure a public exit relay as your + bridge, Tor would be willing to use that exit relay as the last + hop in your circuit as well. Now we fail that circuit instead. + Bugfix on 0.2.0.12-alpha. Fixes bug 2403. Reported by "piebeer". + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 4f8f5fb..b3c9f0e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4063,7 +4063,6 @@ choose_random_entry(cpath_build_state_t *state) int preferred_min, consider_exit_family = 0; if (chosen_exit) { - smartlist_add(exit_family, chosen_exit); routerlist_add_family(exit_family, chosen_exit); consider_exit_family = 1; } @@ -4086,6 +4085,8 @@ choose_random_entry(cpath_build_state_t *state) r = entry_is_live(entry, need_uptime, need_capacity, 0, &msg); if (!r) continue; /* down, no point */ + if (r == chosen_exit) + continue; /* don't pick the same node for entry and exit */ if (consider_exit_family && smartlist_isin(exit_family, r)) continue; /* avoid relays that are family members of our exit */ if (options->EntryNodes &&

1 0

[tor/release-0.2.2] Add some dollar signs in an attempt to appease older asciidocs
by arma＠torproject.org 25 Feb '11

25 Feb '11

commit 530e87ce316f8a3feb1b116c89cc703090217e2d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 18:12:46 2011 -0500 Add some dollar signs in an attempt to appease older asciidocs We should really require a modern asiidoc: backporting stuff to 8.2 is a timesink. --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 033f0a2..8b8fd20 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -330,7 +330,7 @@ Other options can be specified either on the command-line (--option set of "logging domains". Each logging domain corresponds to an area of functionality inside Tor. You can specify any number of severity ranges for a single log statement, each of them prefixed by a comma-separated - list of logging domains. You can prefix a domain with ~ to indicate + list of logging domains. You can prefix a domain with $$~$$ to indicate negation, and use * to indicate "all domains". If you specify a severity range without a list of domains, it matches all domains. + +

1 0

[tor/release-0.2.2] Fix two potential bugs in the bug1863 code.
by arma＠torproject.org 25 Feb '11

25 Feb '11

commit 0642b927928df4ec556a76fed4b0b4523d515a7d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 24 16:44:54 2011 +0100 Fix two potential bugs in the bug1863 code. --- src/or/rephist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 265fff8..3f4a704 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1513,7 +1513,7 @@ rep_hist_update_bwhist_state_section(or_state_t *state, smartlist_free(*s_values); } if (*s_maxima) { - SMARTLIST_FOREACH(*s_values, char *, val, tor_free(val)); + SMARTLIST_FOREACH(*s_maxima, char *, val, tor_free(val)); smartlist_free(*s_maxima); } if (! server_mode(get_options())) { @@ -1541,7 +1541,7 @@ rep_hist_update_bwhist_state_section(or_state_t *state, i = (b->num_maxes_set <= b->next_max_idx) ? 0 : b->next_max_idx; for (j=0; j < b->num_maxes_set; ++j,++i) { uint64_t maxval; - if (i > NUM_TOTALS) + if (i >= NUM_TOTALS) i = 0; tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->totals[i] & ~0x3ff)); smartlist_add(*s_values, cp);

1 0

[tor/release-0.2.2] Merge branch 'bug1863_bwhist' into maint-0.2.2
by arma＠torproject.org 25 Feb '11

25 Feb '11

commit aa178aae03048caf24ce5df4b2d643c7e7afdc7b Merge: 16b8b9b 0642b92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 25 11:22:12 2011 -0500 Merge branch 'bug1863_bwhist' into maint-0.2.2 changes/1863_bwhist | 16 +++ src/or/config.c | 4 + src/or/or.h | 8 ++- src/or/rephist.c | 295 +++++++++++++++++++++++++++----------------------- 4 files changed, 186 insertions(+), 137 deletions(-) diff --combined src/or/config.c index 178ed1e,78978dc..4d2c872 --- a/src/or/config.c +++ b/src/or/config.c @@@ -195,7 -195,6 +195,7 @@@ static config_var_t _option_vars[] = V(CircuitStreamTimeout, INTERVAL, "0"), V(CircuitPriorityHalflife, DOUBLE, "-100.0"), /*negative:'Use default'*/ V(ClientDNSRejectInternalAddresses, BOOL,"1"), + V(ClientRejectInternalAddresses, BOOL, "1"), V(ClientOnly, BOOL, "0"), V(ConsensusParams, STRING, NULL), V(ConnLimit, UINT, "1000"), @@@ -288,7 -287,6 +288,7 @@@ OBSOLETE("IgnoreVersion"), V(KeepalivePeriod, INTERVAL, "5 minutes"), VAR("Log", LINELIST, Logs, NULL), + V(LogMessageDomains, BOOL, "0"), OBSOLETE("LinkPadding"), OBSOLETE("LogLevel"), OBSOLETE("LogFile"), @@@ -407,7 -405,6 +407,7 @@@ static config_var_t testing_tor_network V(AuthDirMaxServersPerAddr, UINT, "0"), V(AuthDirMaxServersPerAuthAddr,UINT, "0"), V(ClientDNSRejectInternalAddresses, BOOL,"0"), + V(ClientRejectInternalAddresses, BOOL, "0"), V(ExitPolicyRejectPrivate, BOOL, "0"), V(V3AuthVotingInterval, INTERVAL, "5 minutes"), V(V3AuthVoteDelay, INTERVAL, "20 seconds"), @@@ -446,15 -443,19 +446,19 @@@ static config_var_t _state_vars[] = V(BWHistoryReadEnds, ISOTIME, NULL), V(BWHistoryReadInterval, UINT, "900"), V(BWHistoryReadValues, CSV, ""), + V(BWHistoryReadMaxima, CSV, ""), V(BWHistoryWriteEnds, ISOTIME, NULL), V(BWHistoryWriteInterval, UINT, "900"), V(BWHistoryWriteValues, CSV, ""), + V(BWHistoryWriteMaxima, CSV, ""), V(BWHistoryDirReadEnds, ISOTIME, NULL), V(BWHistoryDirReadInterval, UINT, "900"), V(BWHistoryDirReadValues, CSV, ""), + V(BWHistoryDirReadMaxima, CSV, ""), V(BWHistoryDirWriteEnds, ISOTIME, NULL), V(BWHistoryDirWriteInterval, UINT, "900"), V(BWHistoryDirWriteValues, CSV, ""), + V(BWHistoryDirWriteMaxima, CSV, ""), V(TorVersion, STRING, NULL), @@@ -1253,6 -1254,7 +1257,6 @@@ options_act(or_options_t *old_options /* Check for transitions that need action. */ if (old_options) { - if ((options->UseEntryGuards && !old_options->UseEntryGuards) || (options->ExcludeNodes && !routerset_equal(old_options->ExcludeNodes,options->ExcludeNodes)) || @@@ -1300,12 -1302,11 +1304,12 @@@ if (options_transition_affects_workers(old_options, options)) { log_info(LD_GENERAL, "Worker-related options changed. Rotating workers."); + + if (init_keys() < 0) { + log_warn(LD_BUG,"Error initializing keys; exiting"); + return -1; + } if (server_mode(options) && !server_mode(old_options)) { - if (init_keys() < 0) { - log_warn(LD_BUG,"Error initializing keys; exiting"); - return -1; - } ip_address_changed(0); if (can_complete_circuit || !any_predicted_circuits(time(NULL))) inform_testing_reachability(); @@@ -2842,9 -2843,7 +2846,9 @@@ compute_publishserverdescriptor(or_opti else if (!strcasecmp(string, "bridge")) *auth |= BRIDGE_AUTHORITY; else if (!strcasecmp(string, "hidserv")) - *auth |= HIDSERV_AUTHORITY; + log_warn(LD_CONFIG, + "PublishServerDescriptor hidserv is invalid. See " + "PublishHidServDescriptors."); else if (!strcasecmp(string, "") || !strcmp(string, "0")) /* no authority */; else @@@ -3348,11 -3347,6 +3352,11 @@@ options_validate(or_options_t *old_opti "PerConnBWBurst", msg) < 0) return -1; + if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) + options->RelayBandwidthBurst = options->RelayBandwidthRate; + if (options->RelayBandwidthBurst && !options->RelayBandwidthRate) + options->RelayBandwidthRate = options->RelayBandwidthBurst; + if (server_mode(options)) { if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { tor_asprintf(msg, @@@ -3381,6 -3375,9 +3385,6 @@@ } } - if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) - options->RelayBandwidthBurst = options->RelayBandwidthRate; - if (options->RelayBandwidthRate > options->RelayBandwidthBurst) REJECT("RelayBandwidthBurst must be at least equal " "to RelayBandwidthRate."); @@@ -3817,9 -3814,7 +3821,9 @@@ options_transition_affects_workers(or_o new_options->ServerDNSSearchDomains || old_options->SafeLogging != new_options->SafeLogging || old_options->ClientOnly != new_options->ClientOnly || - !config_lines_eq(old_options->Logs, new_options->Logs)) + public_server_mode(old_options) != public_server_mode(new_options) || + !config_lines_eq(old_options->Logs, new_options->Logs) || + old_options->LogMessageDomains != new_options->LogMessageDomains) return 1; /* Check whether log options match. */ @@@ -4395,9 -4390,6 +4399,9 @@@ options_init_logs(or_options_t *options } smartlist_free(elts); + if (ok && !validate_only) + logs_set_domain_logging(options->LogMessageDomains); + return ok?0:-1; } @@@ -5157,9 -5149,6 +5161,9 @@@ or_state_load(void return r; } +/** If writing the state to disk fails, try again after this many seconds. */ +#define STATE_WRITE_RETRY_INTERVAL 3600 + /** Write the persistent state to disk. Return 0 for success, <0 on failure. */ int or_state_save(time_t now) @@@ -5194,14 -5183,10 +5198,14 @@@ tor_free(state); fname = get_datadir_fname("state"); if (write_str_to_file(fname, contents, 0)<0) { - log_warn(LD_FS, "Unable to write state to file \"%s\"", fname); + log_warn(LD_FS, "Unable to write state to file \"%s\"; " + "will try again later", fname); global_state->LastWritten = -1; tor_free(fname); tor_free(contents); + /* Try again after STATE_WRITE_RETRY_INTERVAL (or sooner, if the state + * changes sooner). */ + global_state->next_write = now + STATE_WRITE_RETRY_INTERVAL; return -1; } diff --combined src/or/or.h index 2a55668,e0f8bab..74ff743 --- a/src/or/or.h +++ b/src/or/or.h @@@ -583,9 -583,6 +583,9 @@@ typedef enum /** This is a connection on the NATD port, and the destination IP:Port was * either ill-formed or out-of-range. */ #define END_STREAM_REASON_INVALID_NATD_DEST 261 +/** The target address is in a private network (like 127.0.0.1 or 10.0.0.1); + * you don't want to do that over a randomly chosen exit */ +#define END_STREAM_REASON_PRIVATE_ADDR 262 /** Bitwise-and this value with endreason to mask out all flags. */ #define END_STREAM_REASON_MASK 511 @@@ -768,8 -765,6 +768,8 @@@ typedef enum /** Initial value for both sides of a circuit transmission window when the * circuit is initialized. Measured in cells. */ #define CIRCWINDOW_START 1000 +#define CIRCWINDOW_START_MIN 100 +#define CIRCWINDOW_START_MAX 1000 /** Amount to increment a circuit window when we get a circuit SENDME. */ #define CIRCWINDOW_INCREMENT 100 /** Initial value on both sides of a stream transmission window when the @@@ -1173,10 -1168,6 +1173,10 @@@ typedef struct edge_connection_t * zero, abandon the associated mapaddress. */ unsigned int chosen_exit_retries:3; + /** True iff this is an AP connection that came from a transparent or + * NATd connection */ + unsigned int is_transparent_ap:1; + /** If this is a DNSPort connection, this field holds the pending DNS * request that we're going to try to answer. */ struct evdns_server_request *dns_server_request; @@@ -2345,9 -2336,6 +2345,9 @@@ typedef struct config_line_t *Logs; /**< New-style list of configuration lines * for logs */ + int LogMessageDomains; /**< Boolean: Should we log the domain(s) in which + * each log message occurs? */ + char *DebugLogFile; /**< Where to send verbose log messages. */ char *DataDirectory; /**< OR only: where to store long-term data. */ char *Nickname; /**< OR only: nickname of this onion router. */ @@@ -2759,10 -2747,6 +2759,10 @@@ * Helps avoid some cross-site attacks. */ int ClientDNSRejectInternalAddresses; + /** If true, do not accept any requests to connect to internal addresses + * over randomly chosen exits. */ + int ClientRejectInternalAddresses; + /** The length of time that we think a consensus should be fresh. */ int V3AuthVotingInterval; /** The length of time we think it will take to distribute votes. */ @@@ -2872,19 -2856,25 +2872,25 @@@ typedef struct * bandwidth usage. The "Interval" fields hold the granularity, in seconds, * of the entries of Values. The "Values" lists hold decimal string * representations of the number of bytes read or written in each - * interval. */ + * interval. The "Maxima" list holds decimal strings describing the highest + * rate achieved during the interval. + */ time_t BWHistoryReadEnds; int BWHistoryReadInterval; smartlist_t *BWHistoryReadValues; + smartlist_t *BWHistoryReadMaxima; time_t BWHistoryWriteEnds; int BWHistoryWriteInterval; smartlist_t *BWHistoryWriteValues; + smartlist_t *BWHistoryWriteMaxima; time_t BWHistoryDirReadEnds; int BWHistoryDirReadInterval; smartlist_t *BWHistoryDirReadValues; + smartlist_t *BWHistoryDirReadMaxima; time_t BWHistoryDirWriteEnds; int BWHistoryDirWriteInterval; smartlist_t *BWHistoryDirWriteValues; + smartlist_t *BWHistoryDirWriteMaxima; /** Build time histogram */ config_line_t * BuildtimeHistogram; @@@ -2958,11 -2948,6 +2964,11 @@@ struct socks_request_t /* Circuit Build Timeout "public" structures. */ +/** Precision multiplier for the Bw weights */ +#define BW_WEIGHT_SCALE 10000 +#define BW_MIN_WEIGHT_SCALE 1 +#define BW_MAX_WEIGHT_SCALE INT32_MAX + /** Total size of the circuit timeout history to accumulate. * 1000 is approx 2.5 days worth of continual-use circuits. */ #define CBT_NCIRCUITS_TO_OBSERVE 1000 @@@ -2972,8 -2957,6 +2978,8 @@@ /** Number of modes to use in the weighted-avg computation of Xm */ #define CBT_DEFAULT_NUM_XM_MODES 3 +#define CBT_MIN_NUM_XM_MODES 1 +#define CBT_MAX_NUM_XM_MODES 20 /** A build_time_t is milliseconds */ typedef uint32_t build_time_t; @@@ -2995,16 -2978,12 +3001,16 @@@ * build in terms of CDF quantile. */ #define CBT_DEFAULT_CLOSE_QUANTILE 95 +#define CBT_MIN_CLOSE_QUANTILE CBT_MIN_QUANTILE_CUTOFF +#define CBT_MAX_CLOSE_QUANTILE CBT_MAX_QUANTILE_CUTOFF /** * How many circuits count as recent when considering if the * connection has gone gimpy or changed. */ #define CBT_DEFAULT_RECENT_CIRCUITS 20 +#define CBT_MIN_RECENT_CIRCUITS 3 +#define CBT_MAX_RECENT_CIRCUITS 1000 /** * Maximum count of timeouts that finish the first hop in the past @@@ -3015,37 -2994,25 +3021,37 @@@ * gives us. */ #define CBT_DEFAULT_MAX_RECENT_TIMEOUT_COUNT (CBT_DEFAULT_RECENT_CIRCUITS*9/10) +#define CBT_MIN_MAX_RECENT_TIMEOUT_COUNT 3 +#define CBT_MAX_MAX_RECENT_TIMEOUT_COUNT 10000 /** Minimum circuits before estimating a timeout */ #define CBT_DEFAULT_MIN_CIRCUITS_TO_OBSERVE 100 +#define CBT_MIN_MIN_CIRCUITS_TO_OBSERVE 1 +#define CBT_MAX_MIN_CIRCUITS_TO_OBSERVE 10000 /** Cutoff percentile on the CDF for our timeout estimation. */ #define CBT_DEFAULT_QUANTILE_CUTOFF 80 +#define CBT_MIN_QUANTILE_CUTOFF 10 +#define CBT_MAX_QUANTILE_CUTOFF 99 double circuit_build_times_quantile_cutoff(void); /** How often in seconds should we build a test circuit */ #define CBT_DEFAULT_TEST_FREQUENCY 60 +#define CBT_MIN_TEST_FREQUENCY 1 +#define CBT_MAX_TEST_FREQUENCY INT32_MAX /** Lowest allowable value for CircuitBuildTimeout in milliseconds */ #define CBT_DEFAULT_TIMEOUT_MIN_VALUE (1500) +#define CBT_MIN_TIMEOUT_MIN_VALUE 500 +#define CBT_MAX_TIMEOUT_MIN_VALUE INT32_MAX /** Initial circuit build timeout in milliseconds */ #define CBT_DEFAULT_TIMEOUT_INITIAL_VALUE (60*1000) +#define CBT_MIN_TIMEOUT_INITIAL_VALUE CBT_MIN_TIMEOUT_MIN_VALUE +#define CBT_MAX_TIMEOUT_INITIAL_VALUE INT32_MAX int32_t circuit_build_times_initial_timeout(void); -#if CBT_DEFAULT_MAX_RECENT_TIMEOUT_COUNT < 1 +#if CBT_DEFAULT_MAX_RECENT_TIMEOUT_COUNT < CBT_MIN_MAX_RECENT_TIMEOUT_COUNT #error "RECENT_CIRCUITS is set too low." #endif

1 0

[tor/release-0.2.2] Merge remote branch 'arma/bug2403' into maint-0.2.2
by arma＠torproject.org 25 Feb '11

25 Feb '11

commit 16b8b9b00f414343030c29990930c0e52a01fd84 Merge: 530e87c a2727f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 18:38:03 2011 -0500 Merge remote branch 'arma/bug2403' into maint-0.2.2 changes/bug2403 | 6 ++++++ src/or/circuitbuild.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 25 Feb '11

25 Feb '11

commit 999c3c97d2621184ea1b7a0f5b7222ae1f03793b Merge: 7360b53 aa178aa Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Feb 25 13:48:06 2011 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 changes/1863_bwhist | 16 + changes/bug2366 | 8 + changes/bug2403 | 6 + changes/bug2504 | 5 + changes/bug2572 | 5 + changes/log_domains | 12 + changes/torspec.git | 5 + configure.in | 2 +- doc/Makefile.am | 7 +- doc/spec/Makefile.am | 5 - doc/spec/README | 11 + doc/spec/address-spec.txt | 58 - doc/spec/bridges-spec.txt | 249 -- doc/spec/control-spec-v0.txt | 498 ---- doc/spec/control-spec.txt | 1967 ---------------- doc/spec/dir-spec-v1.txt | 314 --- doc/spec/dir-spec-v2.txt | 896 -------- doc/spec/dir-spec.txt | 2426 -------------------- doc/spec/path-spec.txt | 657 ------ doc/spec/proposals/000-index.txt | 188 -- doc/spec/proposals/001-process.txt | 184 -- doc/spec/proposals/098-todo.txt | 107 - doc/spec/proposals/099-misc.txt | 28 - doc/spec/proposals/100-tor-spec-udp.txt | 422 ---- doc/spec/proposals/101-dir-voting.txt | 283 --- doc/spec/proposals/102-drop-opt.txt | 38 - doc/spec/proposals/103-multilevel-keys.txt | 204 -- doc/spec/proposals/104-short-descriptors.txt | 181 -- doc/spec/proposals/105-handshake-revision.txt | 323 --- doc/spec/proposals/106-less-tls-constraint.txt | 111 - doc/spec/proposals/107-uptime-sanity-checking.txt | 54 - doc/spec/proposals/108-mtbf-based-stability.txt | 88 - doc/spec/proposals/109-no-sharing-ips.txt | 90 - doc/spec/proposals/110-avoid-infinite-circuits.txt | 120 - doc/spec/proposals/111-local-traffic-priority.txt | 151 -- .../proposals/112-bring-back-pathlencoinweight.txt | 163 -- .../proposals/113-fast-authority-interface.txt | 85 - doc/spec/proposals/114-distributed-storage.txt | 439 ---- doc/spec/proposals/115-two-hop-paths.txt | 385 ---- .../proposals/116-two-hop-paths-from-guard.txt | 118 - doc/spec/proposals/117-ipv6-exits.txt | 410 ---- doc/spec/proposals/118-multiple-orports.txt | 84 - doc/spec/proposals/119-controlport-auth.txt | 140 -- doc/spec/proposals/120-shutdown-descriptors.txt | 83 - .../121-hidden-service-authentication.txt | 776 ------- doc/spec/proposals/122-unnamed-flag.txt | 136 -- doc/spec/proposals/123-autonaming.txt | 54 - doc/spec/proposals/124-tls-certificates.txt | 313 --- doc/spec/proposals/125-bridges.txt | 291 --- doc/spec/proposals/126-geoip-reporting.txt | 410 ---- .../proposals/127-dirport-mirrors-downloads.txt | 155 -- doc/spec/proposals/128-bridge-families.txt | 64 - doc/spec/proposals/129-reject-plaintext-ports.txt | 114 - doc/spec/proposals/130-v2-conn-protocol.txt | 184 -- doc/spec/proposals/131-verify-tor-usage.txt | 148 -- .../proposals/132-browser-check-tor-service.txt | 145 -- doc/spec/proposals/133-unreachable-ors.txt | 128 - doc/spec/proposals/134-robust-voting.txt | 123 - doc/spec/proposals/135-private-tor-networks.txt | 281 --- doc/spec/proposals/136-legacy-keys.txt | 100 - doc/spec/proposals/137-bootstrap-phases.txt | 235 -- .../138-remove-down-routers-from-consensus.txt | 49 - .../139-conditional-consensus-download.txt | 94 - doc/spec/proposals/140-consensus-diffs.txt | 156 -- doc/spec/proposals/141-jit-sd-downloads.txt | 323 --- .../142-combine-intro-and-rend-points.txt | 277 --- .../143-distributed-storage-improvements.txt | 194 -- .../proposals/144-enforce-distinct-providers.txt | 165 -- doc/spec/proposals/145-newguard-flag.txt | 39 - doc/spec/proposals/146-long-term-stability.txt | 84 - doc/spec/proposals/147-prevoting-opinions.txt | 58 - .../proposals/148-uniform-client-end-reason.txt | 57 - doc/spec/proposals/149-using-netinfo-data.txt | 42 - doc/spec/proposals/150-exclude-exit-nodes.txt | 47 - .../proposals/151-path-selection-improvements.txt | 148 -- doc/spec/proposals/152-single-hop-circuits.txt | 62 - .../153-automatic-software-update-protocol.txt | 175 -- doc/spec/proposals/154-automatic-updates.txt | 377 --- .../155-four-hidden-service-improvements.txt | 120 - doc/spec/proposals/156-tracking-blocked-ports.txt | 527 ----- doc/spec/proposals/157-specific-cert-download.txt | 102 - doc/spec/proposals/158-microdescriptors.txt | 198 -- doc/spec/proposals/159-exit-scanning.txt | 142 -- doc/spec/proposals/160-bandwidth-offset.txt | 105 - .../161-computing-bandwidth-adjustments.txt | 174 -- doc/spec/proposals/162-consensus-flavors.txt | 188 -- doc/spec/proposals/163-detecting-clients.txt | 115 - doc/spec/proposals/164-reporting-server-status.txt | 91 - doc/spec/proposals/165-simple-robust-voting.txt | 133 -- .../proposals/166-statistics-extra-info-docs.txt | 391 ---- doc/spec/proposals/167-params-in-consensus.txt | 47 - doc/spec/proposals/168-reduce-circwindow.txt | 134 -- .../proposals/169-eliminating-renegotiation.txt | 404 ---- doc/spec/proposals/170-user-path-config.txt | 95 - doc/spec/proposals/172-circ-getinfo-option.txt | 138 -- .../proposals/173-getinfo-option-expansion.txt | 101 - doc/spec/proposals/174-optimistic-data-server.txt | 242 -- doc/spec/proposals/ideas/xxx-auto-update.txt | 39 - .../proposals/ideas/xxx-bridge-disbursement.txt | 174 -- doc/spec/proposals/ideas/xxx-bwrate-algs.txt | 106 - .../ideas/xxx-choosing-crypto-in-tor-protocol.txt | 138 -- .../ideas/xxx-controllers-intercept-extends.txt | 44 - .../proposals/ideas/xxx-encrypted-services.txt | 18 - .../proposals/ideas/xxx-exit-scanning-outline.txt | 44 - doc/spec/proposals/ideas/xxx-geoip-survey-plan.txt | 137 -- .../proposals/ideas/xxx-grand-scaling-plan.txt | 97 - doc/spec/proposals/ideas/xxx-hide-platform.txt | 37 - doc/spec/proposals/ideas/xxx-port-knocking.txt | 91 - doc/spec/proposals/ideas/xxx-rate-limit-exits.txt | 63 - .../ideas/xxx-separate-streams-by-port.txt | 59 - doc/spec/proposals/ideas/xxx-using-spdy.txt | 143 -- doc/spec/proposals/ideas/xxx-what-uses-sha1.txt | 247 -- doc/spec/proposals/reindex.py | 117 - doc/spec/rend-spec.txt | 966 -------- doc/spec/socks-extensions.txt | 78 - doc/spec/tor-spec.txt | 1004 -------- doc/spec/version-spec.txt | 44 - doc/tor.1.txt | 28 + src/common/compat.c | 2 +- src/common/log.c | 92 +- src/common/torlog.h | 1 + src/or/circuitbuild.c | 3 +- src/or/config.c | 11 +- src/or/or.h | 11 +- src/or/policies.c | 8 + src/or/policies.h | 1 + src/or/rephist.c | 295 ++-- src/or/router.c | 17 +- 128 files changed, 377 insertions(+), 24815 deletions(-) diff --combined configure.in index 1ec100e,f30402d..4d2f726 --- a/configure.in +++ b/configure.in @@@ -4,7 -4,7 +4,7 @@@ dnl Copyright (c) 2007-2008, The Tor Pr dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.2.19-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.2.22-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST @@@ -946,7 -946,7 +946,7 @@@ f CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib" - AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) + AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) AC_OUTPUT if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then

1 0

[tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 25 Feb '11

25 Feb '11

commit d673479ebaa29b2dc8f227c342785112c945ec18 Merge: 9b745cd 7bdb7d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 21 16:09:23 2011 -0500 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: doc/Makefile.am doc/spec/Makefile.am doc/spec/address-spec.txt doc/spec/bridges-spec.txt doc/spec/control-spec-v0.txt doc/spec/control-spec.txt doc/spec/dir-spec-v1.txt doc/spec/dir-spec-v2.txt doc/spec/dir-spec.txt doc/spec/path-spec.txt doc/spec/proposals/000-index.txt doc/spec/proposals/001-process.txt doc/spec/proposals/098-todo.txt doc/spec/proposals/099-misc.txt doc/spec/proposals/100-tor-spec-udp.txt doc/spec/proposals/101-dir-voting.txt doc/spec/proposals/102-drop-opt.txt doc/spec/proposals/103-multilevel-keys.txt doc/spec/proposals/104-short-descriptors.txt doc/spec/proposals/105-handshake-revision.txt doc/spec/proposals/106-less-tls-constraint.txt doc/spec/proposals/107-uptime-sanity-checking.txt doc/spec/proposals/108-mtbf-based-stability.txt doc/spec/proposals/109-no-sharing-ips.txt doc/spec/proposals/110-avoid-infinite-circuits.txt doc/spec/proposals/111-local-traffic-priority.txt doc/spec/proposals/112-bring-back-pathlencoinweight.txt doc/spec/proposals/113-fast-authority-interface.txt doc/spec/proposals/114-distributed-storage.txt doc/spec/proposals/115-two-hop-paths.txt doc/spec/proposals/116-two-hop-paths-from-guard.txt doc/spec/proposals/117-ipv6-exits.txt doc/spec/proposals/118-multiple-orports.txt doc/spec/proposals/119-controlport-auth.txt doc/spec/proposals/120-shutdown-descriptors.txt doc/spec/proposals/121-hidden-service-authentication.txt doc/spec/proposals/122-unnamed-flag.txt doc/spec/proposals/123-autonaming.txt doc/spec/proposals/124-tls-certificates.txt doc/spec/proposals/125-bridges.txt doc/spec/proposals/126-geoip-reporting.txt doc/spec/proposals/127-dirport-mirrors-downloads.txt doc/spec/proposals/128-bridge-families.txt doc/spec/proposals/129-reject-plaintext-ports.txt doc/spec/proposals/130-v2-conn-protocol.txt doc/spec/proposals/131-verify-tor-usage.txt doc/spec/proposals/132-browser-check-tor-service.txt doc/spec/proposals/134-robust-voting.txt doc/spec/proposals/135-private-tor-networks.txt doc/spec/proposals/137-bootstrap-phases.txt doc/spec/proposals/138-remove-down-routers-from-consensus.txt doc/spec/proposals/140-consensus-diffs.txt doc/spec/proposals/141-jit-sd-downloads.txt doc/spec/proposals/142-combine-intro-and-rend-points.txt doc/spec/proposals/143-distributed-storage-improvements.txt doc/spec/proposals/145-newguard-flag.txt doc/spec/proposals/146-long-term-stability.txt doc/spec/proposals/147-prevoting-opinions.txt doc/spec/proposals/148-uniform-client-end-reason.txt doc/spec/proposals/149-using-netinfo-data.txt doc/spec/proposals/150-exclude-exit-nodes.txt doc/spec/proposals/151-path-selection-improvements.txt doc/spec/proposals/152-single-hop-circuits.txt doc/spec/proposals/153-automatic-software-update-protocol.txt doc/spec/proposals/154-automatic-updates.txt doc/spec/proposals/155-four-hidden-service-improvements.txt doc/spec/proposals/156-tracking-blocked-ports.txt doc/spec/proposals/157-specific-cert-download.txt doc/spec/proposals/158-microdescriptors.txt doc/spec/proposals/159-exit-scanning.txt doc/spec/proposals/ideas/xxx-hide-platform.txt doc/spec/proposals/ideas/xxx-port-knocking.txt doc/spec/proposals/ideas/xxx-separate-streams-by-port.txt doc/spec/proposals/ideas/xxx-what-uses-sha1.txt doc/spec/proposals/reindex.py doc/spec/rend-spec.txt doc/spec/socks-extensions.txt doc/spec/tor-spec.txt doc/spec/version-spec.txt doc/Makefile.am | 7 +- doc/spec/Makefile.am | 5 - doc/spec/README | 10 + doc/spec/address-spec.txt | 58 - doc/spec/bridges-spec.txt | 249 -- doc/spec/control-spec-v0.txt | 498 ---- doc/spec/control-spec.txt | 1967 ---------------- doc/spec/dir-spec-v1.txt | 314 --- doc/spec/dir-spec-v2.txt | 896 -------- doc/spec/dir-spec.txt | 2426 -------------------- doc/spec/path-spec.txt | 657 ------ doc/spec/proposals/000-index.txt | 188 -- doc/spec/proposals/001-process.txt | 184 -- doc/spec/proposals/098-todo.txt | 107 - doc/spec/proposals/099-misc.txt | 28 - doc/spec/proposals/100-tor-spec-udp.txt | 422 ---- doc/spec/proposals/101-dir-voting.txt | 283 --- doc/spec/proposals/102-drop-opt.txt | 38 - doc/spec/proposals/103-multilevel-keys.txt | 204 -- doc/spec/proposals/104-short-descriptors.txt | 181 -- doc/spec/proposals/105-handshake-revision.txt | 323 --- doc/spec/proposals/106-less-tls-constraint.txt | 111 - doc/spec/proposals/107-uptime-sanity-checking.txt | 54 - doc/spec/proposals/108-mtbf-based-stability.txt | 88 - doc/spec/proposals/109-no-sharing-ips.txt | 90 - doc/spec/proposals/110-avoid-infinite-circuits.txt | 120 - doc/spec/proposals/111-local-traffic-priority.txt | 151 -- .../proposals/112-bring-back-pathlencoinweight.txt | 163 -- .../proposals/113-fast-authority-interface.txt | 85 - doc/spec/proposals/114-distributed-storage.txt | 439 ---- doc/spec/proposals/115-two-hop-paths.txt | 385 ---- .../proposals/116-two-hop-paths-from-guard.txt | 118 - doc/spec/proposals/117-ipv6-exits.txt | 410 ---- doc/spec/proposals/118-multiple-orports.txt | 84 - doc/spec/proposals/119-controlport-auth.txt | 140 -- doc/spec/proposals/120-shutdown-descriptors.txt | 83 - .../121-hidden-service-authentication.txt | 776 ------- doc/spec/proposals/122-unnamed-flag.txt | 136 -- doc/spec/proposals/123-autonaming.txt | 54 - doc/spec/proposals/124-tls-certificates.txt | 313 --- doc/spec/proposals/125-bridges.txt | 291 --- doc/spec/proposals/126-geoip-reporting.txt | 410 ---- .../proposals/127-dirport-mirrors-downloads.txt | 155 -- doc/spec/proposals/128-bridge-families.txt | 64 - doc/spec/proposals/129-reject-plaintext-ports.txt | 114 - doc/spec/proposals/130-v2-conn-protocol.txt | 184 -- doc/spec/proposals/131-verify-tor-usage.txt | 148 -- .../proposals/132-browser-check-tor-service.txt | 145 -- doc/spec/proposals/133-unreachable-ors.txt | 128 - doc/spec/proposals/134-robust-voting.txt | 123 - doc/spec/proposals/135-private-tor-networks.txt | 281 --- doc/spec/proposals/136-legacy-keys.txt | 100 - doc/spec/proposals/137-bootstrap-phases.txt | 235 -- .../138-remove-down-routers-from-consensus.txt | 49 - .../139-conditional-consensus-download.txt | 94 - doc/spec/proposals/140-consensus-diffs.txt | 156 -- doc/spec/proposals/141-jit-sd-downloads.txt | 323 --- .../142-combine-intro-and-rend-points.txt | 277 --- .../143-distributed-storage-improvements.txt | 194 -- .../proposals/144-enforce-distinct-providers.txt | 165 -- doc/spec/proposals/145-newguard-flag.txt | 39 - doc/spec/proposals/146-long-term-stability.txt | 84 - doc/spec/proposals/147-prevoting-opinions.txt | 58 - .../proposals/148-uniform-client-end-reason.txt | 57 - doc/spec/proposals/149-using-netinfo-data.txt | 42 - doc/spec/proposals/150-exclude-exit-nodes.txt | 47 - .../proposals/151-path-selection-improvements.txt | 148 -- doc/spec/proposals/152-single-hop-circuits.txt | 62 - .../153-automatic-software-update-protocol.txt | 175 -- doc/spec/proposals/154-automatic-updates.txt | 377 --- .../155-four-hidden-service-improvements.txt | 120 - doc/spec/proposals/156-tracking-blocked-ports.txt | 527 ----- doc/spec/proposals/157-specific-cert-download.txt | 102 - doc/spec/proposals/158-microdescriptors.txt | 198 -- doc/spec/proposals/159-exit-scanning.txt | 142 -- doc/spec/proposals/160-bandwidth-offset.txt | 105 - .../161-computing-bandwidth-adjustments.txt | 174 -- doc/spec/proposals/162-consensus-flavors.txt | 188 -- doc/spec/proposals/163-detecting-clients.txt | 115 - doc/spec/proposals/164-reporting-server-status.txt | 91 - doc/spec/proposals/165-simple-robust-voting.txt | 133 -- .../proposals/166-statistics-extra-info-docs.txt | 391 ---- doc/spec/proposals/167-params-in-consensus.txt | 47 - doc/spec/proposals/168-reduce-circwindow.txt | 134 -- .../proposals/169-eliminating-renegotiation.txt | 404 ---- doc/spec/proposals/170-user-path-config.txt | 95 - doc/spec/proposals/172-circ-getinfo-option.txt | 138 -- .../proposals/173-getinfo-option-expansion.txt | 101 - doc/spec/proposals/174-optimistic-data-server.txt | 242 -- doc/spec/proposals/ideas/xxx-auto-update.txt | 39 - .../proposals/ideas/xxx-bridge-disbursement.txt | 174 -- doc/spec/proposals/ideas/xxx-bwrate-algs.txt | 106 - .../ideas/xxx-choosing-crypto-in-tor-protocol.txt | 138 -- .../ideas/xxx-controllers-intercept-extends.txt | 44 - .../proposals/ideas/xxx-encrypted-services.txt | 18 - .../proposals/ideas/xxx-exit-scanning-outline.txt | 44 - doc/spec/proposals/ideas/xxx-geoip-survey-plan.txt | 137 -- .../proposals/ideas/xxx-grand-scaling-plan.txt | 97 - doc/spec/proposals/ideas/xxx-hide-platform.txt | 37 - doc/spec/proposals/ideas/xxx-port-knocking.txt | 91 - doc/spec/proposals/ideas/xxx-rate-limit-exits.txt | 63 - .../ideas/xxx-separate-streams-by-port.txt | 59 - doc/spec/proposals/ideas/xxx-using-spdy.txt | 143 -- doc/spec/proposals/ideas/xxx-what-uses-sha1.txt | 247 -- doc/spec/proposals/reindex.py | 117 - doc/spec/rend-spec.txt | 966 -------- doc/spec/socks-extensions.txt | 78 - doc/spec/tor-spec.txt | 1004 -------- doc/spec/version-spec.txt | 44 - 109 files changed, 11 insertions(+), 24652 deletions(-) diff --combined doc/Makefile.am index 693378c,2959813..bc3d8df --- a/doc/Makefile.am +++ b/doc/Makefile.am @@@ -1,83 -1,12 +1,78 @@@ - +# We use a two-step process to generate documentation from asciidoc files. +# +# First, we use asciidoc/a2x to process the asciidoc files into .1.in and +# .html.in files (see the asciidoc-helper.sh script). These are the same as +# the regular .1 and .html files, except that they still have some autoconf +# variables set in them. +# +# Second, we use config.status to turn .1.in files into .1 files and +# .html.in files into .html files. +# +# We do the steps in this order so that we can ship the .*.in files as +# part of the source distribution, so that people without asciidoc can +# just use the .1 and .html files. -EXTRA_DIST = HACKING \ - tor-resolve.1 tor-gencert.1 \ - tor-osx-dmg-creation.txt tor-rpm-creation.txt \ +if USE_ASCIIDOC +asciidoc_files = tor tor-gencert tor-resolve torify +html_in = $(asciidoc_files:=.html.in) +man_in = $(asciidoc_files:=.1.in) +txt_in = $(asciidoc_files:=.1.txt) +nodist_man_MANS = $(asciidoc_files:=.1) +doc_DATA = $(asciidoc_files:=.html) +else +asciidoc_files = +html_in = +man_in = +txt_in = +nodist_man_MANS = +doc_DATA = +endif + +EXTRA_DIST = HACKING asciidoc-helper.sh \ + $(html_in) $(man_in) $(txt_in) \ + tor-rpm-creation.txt \ - tor-win32-mingw-creation.txt + tor-win32-mingw-creation.txt spec/README -man_MANS = tor.1 tor-resolve.1 tor-gencert.1 +docdir = @docdir@ + +asciidoc_product = $(nodist_man_MANS) $(doc_DATA) + - SUBDIRS = spec - - DIST_SUBDIRS = spec - +# Generate the html documentation from asciidoc, but don't do +# machine-specific replacements yet +$(html_in) : + $(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/doc/$@ + +tor.html.in : tor.1.txt +torify.html.in : torify.1.txt +tor-gencert.html.in : tor-gencert.1.txt +tor-resolve.html.in : tor-resolve.1.txt + +# Generate the manpage from asciidoc, but don't do +# machine-specific replacements yet +$(man_in) : + $(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/doc/$@ + +tor.1.in : tor.1.txt +torify.1.in : torify.1.txt +tor-gencert.1.in : tor-gencert.1.txt +tor-resolve.1.in : tor-resolve.1.txt -SUBDIRS = design-paper +# use ../config.status to swap all machine-specific magic strings +# in the asciidoc with their replacements. +$(asciidoc_product) : + if test -e $(top_srcdir)/doc/$@.in && ! test -e ./$@.in ; then \ + cp $(top_srcdir)/doc/$@.in .; \ + fi + ../config.status --file=$@; -DIST_SUBDIRS = design-paper +tor.1 : tor.1.in +torify.1 : torify.1.in +tor-gencert.1 : tor-gencert.1.in +tor-resolve.1 : tor-resolve.1.in +tor.html : tor.html.in +torify.html : torify.html.in +tor-gencert.html : tor-gencert.html.in +tor-resolve.html : tor-resolve.html.in +CLEANFILES = $(asciidoc_product) config.log +DISTCLEANFILES = $(html_in) $(man_in)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits