- tor-commits - lists.torproject.org

[tor/release-0.2.2] Fix libevent autoconf bug #2698
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit b62abf9f21499abda5b703271d5663a2a7380ca0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Mar 16 18:35:31 2011 -0700 Fix libevent autoconf bug #2698 --- changes/bug2698 | 3 +++ configure.in | 20 +++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/changes/bug2698 b/changes/bug2698 new file mode 100644 index 0000000..3c2468f --- /dev/null +++ b/changes/bug2698 @@ -0,0 +1,3 @@ + o Minor build issues + - We incorrectly linked libevent when configured with + --enable-static-libevent. Fixes bug 2698. diff --git a/configure.in b/configure.in index 4436fe2..bd94174 100644 --- a/configure.in +++ b/configure.in @@ -271,7 +271,21 @@ tor_libevent_pkg_debian="libevent-dev" tor_libevent_devpkg_redhat="libevent-devel" tor_libevent_devpkg_debian="libevent-dev" -TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $TOR_LIB_WS32], [ +dnl On Gnu/Linux or any place we require it, we'll add librt to the Libevent +dnl linking for static builds. +STATIC_LIBEVENT_FLAGS="" +if test "$enable_static_libevent" = "yes"; then + dnl Determine if we have clock_gettime in librt + AC_SEARCH_LIBS([clock_gettime], [rt], + [have_rt=yes]) + if test "$have_rt" = yes; then + STATIC_LIBEVENT_FLAGS=" -lrt " + else + STATIC_LIBEVENT_FLAGS="" + fi +fi + +TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32], [ #ifdef WIN32 #include <winsock2.h> #endif @@ -294,7 +308,7 @@ dnl Now check for particular libevent functions. save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" save_CPPFLAGS="$CPPFLAGS" -LIBS="-levent $TOR_LIB_WS32 $LIBS" +LIBS="-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $LIBS" LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS" CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS" 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) @@ -315,7 +329,7 @@ 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") else - TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a" + TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a $STATIC_LIBEVENT_FLAGS" fi else TOR_LIBEVENT_LIBS="-levent"

1 0

[tor/release-0.2.2] Small tweaks for bug2698 bugfix
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 47621188328c19be18a6915f937e4e0f7e04fba8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 27 05:35:17 2011 +0200 Small tweaks for bug2698 bugfix --- changes/bug2698 | 9 ++++++--- configure.in | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/changes/bug2698 b/changes/bug2698 index 3c2468f..d995788 100644 --- a/changes/bug2698 +++ b/changes/bug2698 @@ -1,3 +1,6 @@ - o Minor build issues - - We incorrectly linked libevent when configured with - --enable-static-libevent. Fixes bug 2698. + o Minor bugfixes: + - Fix an issue that prevented static linking of libevent on + some platforms (notably Linux). Fixes bug 2698, bugfix on + versions 0.2.1.23/0.2.2.8-alpha (the versions introducing + the --with-static-libevent configure option). + diff --git a/configure.in b/configure.in index bd94174..6ed43ce 100644 --- a/configure.in +++ b/configure.in @@ -280,8 +280,6 @@ if test "$enable_static_libevent" = "yes"; then [have_rt=yes]) if test "$have_rt" = yes; then STATIC_LIBEVENT_FLAGS=" -lrt " - else - STATIC_LIBEVENT_FLAGS="" fi fi

1 0

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

01 Apr '11

commit 22f7042b9184d4463429072d788d52f4fc75e866 Merge: 4762118 3a7cee9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 17:49:34 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/zlib_aint_openssl | 3 +++ configure.in | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/release-0.2.2] Implement replacements for timer(add, cmp, sub) on platforms lacking them.
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 5eaba5ac2128eebf095441e23b6b7516ce35dd5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 30 14:29:57 2011 -0400 Implement replacements for timer(add,cmp,sub) on platforms lacking them. --- src/common/compat.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 35829e1..550c08b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -333,6 +333,48 @@ struct tm *tor_localtime_r(const time_t *timep, struct tm *result); struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #endif +#ifndef timeradd +/** Replacement for timeradd on platforms that do not have it: sets tvout to + * the sum of tv1 and tv2. */ +#define timeradd(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec + (tv2)->tv_usec; \ + if ((tvout)->tv_usec >= 1000000) { \ + (tvout)->tv_usec -= 1000000; \ + (tvout)->tv_sec++; \ + } \ + } while (0) +#endif + +#ifndef timersub +/** Replacement for timersub on platforms that do not have it: sets tvout to + * tv1 minus tv2. */ +#define timersub(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec - (tv2)->tv_usec; \ + if ((tvout)->tv_usec < 0) { \ + (tvout)->tv_usec += 1000000; \ + (tvout)->tv_sec--; \ + } \ + } while (0) +#endif + +#ifndef timercmp +/** Replacement for timersub on platforms that do not have it: returns true + * iff the relational operator "op" makes the expression tv1 op tv2 true. + * + * Note that while this definition should work for all boolean opeators, some + * platforms' native timercmp definitions do not support >=, <=, or ==. So + * don't use those. + */ +#define timercmp(tv1,tv2,op) \ + (((tv1)->tv_sec == (tv2)->tv_sec) ? \ + ((tv1)->tv_usec op (tv2)->tv_usec) : \ + ((tv1)->tv_sec op (tv2)->tv_sec)) +#endif + /* ===== File compatibility */ int replace_file(const char *from, const char *to); int touch_file(const char *fname);

1 0

[tor/release-0.2.2] Resolve the one DOCDOC in the 0.2.2 code atm
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 721954b3a2a55e82160815f4c133e7da66712542 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:07:55 2011 -0400 Resolve the one DOCDOC in the 0.2.2 code atm --- src/common/compat_libevent.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 0e5a906..3efc56d 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -228,9 +228,9 @@ tor_libevent_get_method(void) #endif } -/** Return the le_version_t for the current version of libevent. If the - * version is very new, return LE_OTHER. If the version is so old that it - * doesn't support event_get_version(), return LE_OLD. DOCDOC */ +/** Return the le_version_t for the version of libevent specified in the + * string <b>v</b>. If the version is very new or uses an unrecognized + * version, format, return LE_OTHER. */ static le_version_t tor_decode_libevent_version(const char *v) { @@ -280,7 +280,7 @@ le_versions_compatibility(le_version_t v) } /** Return the version number of the currently running version of Libevent. - See le_version_t for info on the format. + * See le_version_t for info on the format. */ static le_version_t tor_get_libevent_version(const char **v_out)

1 0

[tor/release-0.2.2] Merge remote branch 'sebastian/bug2696' into maint-0.2.2
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit f3d666366555226ec2ad0f647489a1d42145a2eb Merge: 9dfa244 4aac35c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:39:40 2011 -0400 Merge remote branch 'sebastian/bug2696' into maint-0.2.2 changes/bug2696 | 5 +++++ configure.in | 24 +++++++++++++++++++----- src/or/geoip.c | 18 +++++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-)

1 0

[tor/release-0.2.2] Remove superfluous -g -O2 compiler argument
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 3f94c4a1cb284ad177bbf2171d6d1c955d8baa85 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 18 17:04:01 2011 +0100 Remove superfluous -g -O2 compiler argument Autoconf adds -g -O2 by default, so adding it ourselves is not required. It also caused a warning with clang for every source file, so remove it here. Fixes last issue of ticket 2696. --- configure.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 9999f60..4436fe2 100644 --- a/configure.in +++ b/configure.in @@ -865,12 +865,13 @@ fi # Set CFLAGS _after_ all the above checks, since our warnings are stricter # than autoconf's macros like. if test "$GCC" = yes; then - CFLAGS="$CFLAGS -Wall -g -O2" # Disable GCC's strict aliasing checks. They are an hours-to-debug # accident waiting to happen. - CFLAGS="$CFLAGS -fno-strict-aliasing" + CFLAGS="$CFLAGS -Wall -fno-strict-aliasing" else - CFLAGS="$CFLAGS -g -O" + # Autoconf sets -g -O2 by default. Override optimization level + # for non-gcc compilers + CFLAGS="$CFLAGS -O" enable_gcc_warnings=no enable_gcc_warnings_advisory=no fi

1 0

[tor/release-0.2.2] Fix signed/unsigned compare warning
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit fe86be61b6d84fbb442b13aa52139e6a3892dac0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:42:00 2011 -0400 Fix signed/unsigned compare warning --- src/or/geoip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index a991654..654241c 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -426,7 +426,7 @@ geoip_note_client_seen(geoip_client_action_t action, ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } - if (now / 60 <= MAX_LAST_SEEN_IN_MINUTES && now >= 0) + if (now / 60 <= (int)MAX_LAST_SEEN_IN_MINUTES && now >= 0) ent->last_seen_in_minutes = (unsigned)(now/60); else ent->last_seen_in_minutes = 0;

1 0

[tor/release-0.2.2] Futz with the clang patch a bit and tidy some geoip.c stuff
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 547635c0049ec92e929e0f360f729b5dd308a215 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 17 14:06:04 2011 -0400 Futz with the clang patch a bit and tidy some geoip.c stuff --- src/or/geoip.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index f3e0b72..a991654 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -278,19 +278,24 @@ geoip_is_loaded(void) return geoip_countries != NULL && geoip_entries != NULL; } -#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu - /** Entry in a map from IP address to the last time we've seen an incoming * connection from that IP address. Used by bridges only, to track which * countries have them blocked. */ typedef struct clientmap_entry_t { HT_ENTRY(clientmap_entry_t) node; uint32_t ipaddr; + /** Time when we last saw this IP address, in MINUTES since the epoch. + * + * (This will run out of space around 4011 CE. If Tor is still in use around + * 4000 CE, please remember to add more bits to last_seen_in_minutes.) */ unsigned int last_seen_in_minutes:30; unsigned int action:2; } clientmap_entry_t; -#define ACTION_MASK 3 +/** Largest allowable value for last_seen_in_minutes. (It's a 30-bit field, + * so it can hold up to (1u<<30)-1, or 0x3fffffffu. + */ +#define MAX_LAST_SEEN_IN_MINUTES 0X3FFFFFFFu /** Map from client IP address to last time seen. */ static HT_HEAD(clientmap, clientmap_entry_t) client_history = @@ -415,16 +420,16 @@ geoip_note_client_seen(geoip_client_action_t action, lookup.ipaddr = addr; lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); - tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES); - if (ent) { - ent->last_seen_in_minutes = (unsigned)(now/60); - } else { + if (! ent) { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); ent->ipaddr = addr; - ent->last_seen_in_minutes = (unsigned)(now/60); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } + if (now / 60 <= MAX_LAST_SEEN_IN_MINUTES && now >= 0) + ent->last_seen_in_minutes = (unsigned)(now/60); + else + ent->last_seen_in_minutes = 0; if (action == GEOIP_CLIENT_NETWORKSTATUS || action == GEOIP_CLIENT_NETWORKSTATUS_V2) {

1 0

[tor/release-0.2.2] Document a few more members.
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 9dfa244484ff9c52d545daa620e034b4d03f969c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:10:15 2011 -0400 Document a few more members. --- src/or/config.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d4be207..5719a64 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4770,10 +4770,10 @@ options_save_current(void) } /** Mapping from a unit name to a multiplier for converting that unit into a - * base unit. */ + * base unit. Used by config_parse_unit. */ struct unit_table_t { - const char *unit; - uint64_t multiplier; + const char *unit; /**< The name of the unit */ + uint64_t multiplier; /**< How many of the base unit appear in this unit */ }; /** Table to map the names of memory units to the number of bytes they

1 0