tor-commits

tor-commits@lists.torproject.org

1 participants
212404 discussions

[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

[tor/release-0.2.2] Add 2696 changes file
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 4aac35cafa9843d10b05921da51dcc42bc3e9176 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 18 17:13:43 2011 +0100 Add 2696 changes file --- changes/bug2696 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug2696 b/changes/bug2696 new file mode 100644 index 0000000..6ea41d4 --- /dev/null +++ b/changes/bug2696 @@ -0,0 +1,5 @@ + o Minor features: + - Make compilation with clang possible when using + --enable-gcc-warnings by removing two warnings that clang hasn't + implemented yet and by fixing a few warnings. Implements ticket + 2696.

1 0

[tor/release-0.2.2] add changes file for the doxygen issues
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit cf399f1034cec6be2b7a98cb82a8607634e120f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 17:13:27 2011 -0400 add changes file for the doxygen issues --- changes/doxygen | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/doxygen b/changes/doxygen new file mode 100644 index 0000000..5e5fcd1 --- /dev/null +++ b/changes/doxygen @@ -0,0 +1,6 @@ + o Documentation changes + - Modernize the doxygen configuration file slightly. Fixes bug 2707. + - Resolve all doxygen warnings except those for missing documentation. + Fixes bug 2705. + - Add doxygen documentation for more functions, fields, and types. +

1 0

[tor/release-0.2.2] Clean up whitespace
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 3310dd23583dd0a799477bb042cb06c3c058147b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 17:11:27 2011 -0400 Clean up whitespace --- src/common/crypto.c | 1 + src/common/log.c | 6 +++--- src/test/test_crypto.c | 6 ++++-- src/test/test_dir.c | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index ed434a3..2ef40c2 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2710,3 +2710,4 @@ setup_openssl_threading(void) } #endif /** @} */ + diff --git a/src/common/log.c b/src/common/log.c index c1a61d0..28d0029 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -390,7 +390,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, /** Output a message to the log. It gets logged to all logfiles that * care about messages with severity in domain. The content - * if formatted printf style + * is formatted printf style basedc on format and extra arguments. * */ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) @@ -406,8 +406,8 @@ tor_log(int severity, log_domain_mask_t domain, const char *format, ...) /** Output a message to the log, prefixed with a function name fn. */ #ifdef __GNUC__ /** GCC-based implementation of the log_fn backend, used when we have - * variadic macros. All arguments are as for log_fn, except for fn, which - * is the name of the calling functions. */ + * variadic macros. All arguments are as for log_fn, except for + * fn, which is the name of the calling functions. */ void _log_fn(int severity, log_domain_mask_t domain, const char *fn, const char *format, ...) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 6ea7f29..781081a 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -384,12 +384,14 @@ test_crypto_pk(void) /* Now try signing. */ strlcpy(data1, "Ossifrage", 1024); test_eq(128, crypto_pk_private_sign(pk1, data2, sizeof(data2), data1, 10)); - test_eq(10, crypto_pk_public_checksig(pk1, data3, sizeof(data3), data2, 128)); + test_eq(10, + crypto_pk_public_checksig(pk1, data3, sizeof(data3), data2, 128)); test_streq(data3, "Ossifrage"); /* Try signing digests. */ test_eq(128, crypto_pk_private_sign_digest(pk1, data2, sizeof(data2), data1, 10)); - test_eq(20, crypto_pk_public_checksig(pk1, data3, sizeof(data3), data2, 128)); + test_eq(20, + crypto_pk_public_checksig(pk1, data3, sizeof(data3), data2, 128)); test_eq(0, crypto_pk_public_checksig_digest(pk1, data1, 10, data2, 128)); test_eq(-1, crypto_pk_public_checksig_digest(pk1, data1, 11, data2, 128)); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 1f3beb4..8fd9428 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -748,11 +748,11 @@ test_dir_v3_networkstatus(void) sign_skey_leg1 = pk_generate(4); test_assert(!crypto_pk_read_private_key_from_string(sign_skey_1, - AUTHORITY_SIGNKEY_1, -1)); + AUTHORITY_SIGNKEY_1, -1)); test_assert(!crypto_pk_read_private_key_from_string(sign_skey_2, - AUTHORITY_SIGNKEY_2, -1)); + AUTHORITY_SIGNKEY_2, -1)); test_assert(!crypto_pk_read_private_key_from_string(sign_skey_3, - AUTHORITY_SIGNKEY_3, -1)); + AUTHORITY_SIGNKEY_3, -1)); test_assert(!crypto_pk_cmp_keys(sign_skey_1, cert1->signing_key)); test_assert(!crypto_pk_cmp_keys(sign_skey_2, cert2->signing_key));

1 0

[tor/release-0.2.2] Move the decl for tor_gettimofday_cache_clear to the right header
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 27d1675d93a07227aae3bb1d86bd4876d6c3ac77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 17:54:43 2011 -0400 Move the decl for tor_gettimofday_cache_clear to the right header --- src/or/relay.c | 4 ++-- src/or/relay.h | 2 ++ src/or/routerparse.h | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 2510242..076b46b 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -52,9 +52,9 @@ static int circuit_consider_stop_edge_reading(circuit_t *circ, crypt_path_t *layer_hint); static int circuit_queue_streams_are_blocked(circuit_t *circ); +/* XXXX023 move this all to compat_libevent */ /** Cache the current hi-res time; the cache gets reset when libevent * calls us. */ - static struct timeval cached_time_hires = {0, 0}; /** Stop reading on edge connections when we have this many cells @@ -76,7 +76,7 @@ tor_gettimeofday_cached(struct timeval *tv) void tor_gettimeofday_cache_clear(void) { - cached_time_hires.tv_sec = 0; + cached_time_hires.tv_sec = 0; } /** Stats: how many relay cells have originated at this hop, or have diff --git a/src/or/relay.h b/src/or/relay.h index dbba092..f64752d 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -64,5 +64,7 @@ void cell_ewma_set_scale_factor(or_options_t *options, networkstatus_t *consensus); void circuit_clear_cell_queue(circuit_t *circ, or_connection_t *orconn); +void tor_gettimeofday_cache_clear(void); + #endif diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 3499f18..8b8cde2 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -82,7 +82,5 @@ int rend_parse_introduction_points(rend_service_descriptor_t *parsed, size_t intro_points_encoded_size); int rend_parse_client_keys(strmap_t *parsed_clients, const char *str); -void tor_gettimeofday_cache_clear(void); - #endif

1 0

[tor/release-0.2.2] Remove a useless doxygen comment
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 8f9cfa0abe3793e120ee25a0f339bcee4d3fa4db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:07:42 2011 -0400 Remove a useless doxygen comment --- src/or/rephist.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index e4afe62..58e8ff0 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2337,7 +2337,6 @@ typedef struct circ_buffer_stats_t { uint32_t local_circ_id; } circ_buffer_stats_t; -/** Holds stats. */ smartlist_t *circuits_for_buffer_stats = NULL; /** Remember cell statistics for circuit circ at time

1 0

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

01 Apr '11

commit ab418447eb9838a8a6f5588e374910d753740d0f Merge: 5938804 06f026d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 15:18:15 2011 -0400 Merge branch 'bug2757' into maint-0.2.2 changes/bug2757 | 6 ++++++ src/or/connection.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Turn on the "source browser" feature for our generated HTML.
by arma＠torproject.org 01 Apr '11

01 Apr '11

commit 2def9e0a6e8fc4fa21696aa4fa9cfeaf2442e706 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 14:36:42 2011 -0400 Turn on the "source browser" feature for our generated HTML. --- Doxyfile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doxyfile.in b/Doxyfile.in index bf71399..41f599d 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -649,7 +649,7 @@ FILTER_SOURCE_FILES = NO # Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES # Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits