- tor-commits - lists.torproject.org

[tor/release-0.2.3] fold in more changes entries
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 36d8a2535e01bce2c1c5242e76a4a2e134f06040 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 13:42:30 2012 -0400 fold in more changes entries --- ChangeLog | 10 +++++++++- changes/bug5238 | 4 ---- changes/bug6244 | 4 ---- changes/bug6244_part2 | 4 ---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c88187..8eb082c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ Changes in version 0.2.3.18-rc - 2012-06-28 o Major bugfixes: + - Allow wildcarded mapaddress targets to be specified on the + controlport. Partially fixes bug 6244; bugfix on 0.2.3.9-alpha. - Make our linker option detection code more robust against linkers such as on FreeBSD 8, where a bad combination of options completes successfully but makes an unrunnable binary. Fixes bug 6173; @@ -11,8 +13,11 @@ Changes in version 0.2.3.18-rc - 2012-06-28 the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. - Replace "Sending publish request" log messages with "Launching upload", so that they no longer confusingly imply that we're - sending somtheing to a directory we might not even be connected + sending something to a directory we might not even be connected to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. + - Downgrade "Got a certificate, but we already have it" log messages + from warning to info, except when we're a dirauth. Fixes bug 5238; + bugfix on 0.2.1.7-alpha. - When checking for requested signatures on the latest consensus before serving it to a client, make sure to check the right consensus flavor. Bugfix on 0.2.2.6-alpha. @@ -26,6 +31,9 @@ Changes in version 0.2.3.18-rc - 2012-06-28 launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. - Don't do DNS lookups when parsing corrupted managed proxy protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. + - When formatting wildcarded address mappings for the controller, + be sure to include "*." as appropriate. Partially fixes bug 6244; + bugfix on 0.2.3.9-alpha. - Avoid a warning caused by using strcspn() from glibc with clang 3.0. Bugfix on 0.2.3.13-alpha. - Make format_helper_exit_status() avoid unnecessary space padding and diff --git a/changes/bug5238 b/changes/bug5238 deleted file mode 100644 index 866f796..0000000 --- a/changes/bug5238 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Downgrade "Got a certificate, but we already have it" log mesages from - warning to info, except when we're a dirauth. Fixes bug #5238; bugfix - on 0.2.1.7-alpha. diff --git a/changes/bug6244 b/changes/bug6244 deleted file mode 100644 index c6d64ff..0000000 --- a/changes/bug6244 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Allow wildcarded mapaddress targets to be specified on the controlport. - Partial fix for bug 6244; bugfix on 0.2.3.9-alpha. - diff --git a/changes/bug6244_part2 b/changes/bug6244_part2 deleted file mode 100644 index ffeb5cd..0000000 --- a/changes/bug6244_part2 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - When formatting wildcarded address mappings for the controller, - be sure to include "*." as appropriate. Partial fix for bug 6244; - bugfix on 0.2.3.9-alpha.

1 0

[tor/release-0.2.3] bump to 0.2.3.18-rc
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 64f8e68e65f32c742eab85d993da2a838f90dcf3 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 15:34:33 2012 -0400 bump to 0.2.3.18-rc --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 556bb66..e9ef4f8 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.17-beta-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.18-rc) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 6643925..75b2567 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.17-beta-dev" +!define VERSION "0.2.3.18-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 3449277..a5bd2ee 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.17-beta-dev" +#define VERSION "0.2.3.18-rc"

1 0

[tor/release-0.2.3] add a blurb for 0.2.3.18-rc, other minor cleanups
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 81cd3d7ad641a8dbf1076e011d209cfc3d6af2b0 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 15:32:36 2012 -0400 add a blurb for 0.2.3.18-rc, other minor cleanups --- ChangeLog | 29 +++++++++++++++++------------ src/common/util.c | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8eb082c..3d666a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ Changes in version 0.2.3.18-rc - 2012-06-28 + Tor 0.2.3.18-rc is the first release candidate for the Tor 0.2.3.x + series. It fixes a few smaller bugs, but generally appears stable. + Please test it and let us know whether it is! o Major bugfixes: - Allow wildcarded mapaddress targets to be specified on the @@ -15,6 +18,10 @@ Changes in version 0.2.3.18-rc - 2012-06-28 upload", so that they no longer confusingly imply that we're sending something to a directory we might not even be connected to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. + - Make sure to set *socket_error in all error cases in + connection_connect(), so it can't produce a warning about + errno being zero from errno_to_orconn_end_reason(). Bugfix on + 0.2.1.1-alpha; resolves ticket 6028. - Downgrade "Got a certificate, but we already have it" log messages from warning to info, except when we're a dirauth. Fixes bug 5238; bugfix on 0.2.1.7-alpha. @@ -25,10 +32,16 @@ Changes in version 0.2.3.18-rc - 2012-06-28 Fixes bug 5932; bugfix on 0.2.2.7-alpha. o Minor bugfixes (on 0.2.3.x): + - Make format_helper_exit_status() avoid unnecessary space padding + and stop confusing log_from_pipe(). Fixes ticket 5557; bugfix + on 0.2.3.1-alpha. - Downgrade a message about cleaning the microdescriptor cache to "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. - - Improve log message issued when a managed proxy fails to - launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. + - Log a BUG message at severity INFO if we have a networkstatus with + a missing entry for some microdescriptor. Continues on a patch + to 0.2.3.2-alpha. + - Improve the log message when a managed proxy fails to launch. Fixes + bug 5099; bugfix on 0.2.3.6-alpha. - Don't do DNS lookups when parsing corrupted managed proxy protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. - When formatting wildcarded address mappings for the controller, @@ -36,22 +49,14 @@ Changes in version 0.2.3.18-rc - 2012-06-28 bugfix on 0.2.3.9-alpha. - Avoid a warning caused by using strcspn() from glibc with clang 3.0. Bugfix on 0.2.3.13-alpha. - - Make format_helper_exit_status() avoid unnecessary space padding and - stop confusing log_from_pipe(). Fixes ticket 5557. - - Make sure to set *socket_error in all error cases in - connection_connect(), so it can't produce a warning about errno - being zero from errno_to_orconn_end_reason(). Resolves ticket 6028. - - Remove non-bug log messages about running with circuit timeout - learning enabled from LD_BUG. Fixes bug 6169; bugfix on - 0.2.3.17-beta. + - Stop logging messages about running with circuit timeout learning + enabled at severity LD_BUG. Fixes bug 6169; bugfix on 0.2.3.17-beta. - Disable a spurious warning about reading on a marked and flushing connection. We shouldn't be doing that, but apparently we sometimes do. Fixes bug 6203; bugfix on 0.2.3.17-beta. - Fix a bug that stopped AllowDotExit from working on addresses that had an entry in the DNS cache. Fixes bug 6211; bugfix on 0.2.3.17-beta. - - Log a BUG message at INFO if we have a networkstatus with a missing - entry for some microdescriptor. o Code simplification, refactoring, unit tests: - Move tor_gettimeofday_cached() into compat_libevent.c, and use diff --git a/src/common/util.c b/src/common/util.c index 51d9321..a0dff2e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3888,7 +3888,7 @@ tor_get_exit_code(const process_handle_t *process_handle, } /** Helper: return the number of characters in s preceding the first - * occurence of ch. If ch does not occur in s, return + * occurrence of ch. If ch does not occur in s, return * the length of s. Should be equivalent to strspn(s, "ch"). */ static INLINE size_t str_num_before(const char *s, char ch)

1 0

[tor/release-0.2.3] fix grammar in comment
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit dd7a27d17e2240ed7f7fdf62116c009358224b5d Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 13:43:01 2012 -0400 fix grammar in comment --- src/or/circuitbuild.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 074b78d..6d1e4e7 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3503,7 +3503,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) if (state && options->UseEntryGuards && (purpose != CIRCUIT_PURPOSE_TESTING || options->BridgeRelay)) { - /* This is request for an entry server to use for a regular circuit, + /* This request is for an entry server to use for a regular circuit, * and we use entry guard nodes. Just return one of the guard nodes. */ return choose_random_entry(state); }

1 0

[tor/release-0.2.3] Disable warning for marked-but-reading in main.c
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 0600e8cab17d2128d663b31d93b93ddc1ab95ee2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 19 11:48:03 2012 -0400 Disable warning for marked-but-reading in main.c It turns out this can happen. Even though there is no reason for connections to be marked but reading, we leave them reading anyway, so warning here is unwarranted. Let's turn that back on once we do something sensible and disable reading when we mark. Bugfix for 6203 on Tor 0.2.3.17-beta. Thanks to cypherpunks for pointing out the general stupidity of the original code here. --- changes/bug6203 | 5 +++++ src/or/main.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/changes/bug6203 b/changes/bug6203 new file mode 100644 index 0000000..bf96753 --- /dev/null +++ b/changes/bug6203 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Disable a spurious warning about reading on a marked and flushing + connection. We shouldn't be doing that, but apparently we + sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta. + diff --git a/src/or/main.c b/src/or/main.c index f8740d7..1f3117b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -848,7 +848,10 @@ conn_close_if_marked(int i) "Holding conn (fd %d) open for more flushing.", (int)conn->s)); conn->timestamp_lastwritten = now; /* reset so we can flush more */ - } else if (sz == 0) { /* retval is also 0 */ + } else if (sz == 0) { + /* Also, retval==0. If we get here, we didn't want to write anything + * (because of rate-limiting) and we didn't. */ + /* Connection must flush before closing, but it's being rate-limited. * Let's remove from Libevent, and mark it as blocked on bandwidth * so it will be re-added on next token bucket refill. Prevents @@ -860,6 +863,13 @@ conn_close_if_marked(int i) connection_stop_writing(conn); } if (connection_is_reading(conn)) { + /* XXXX024 We should make this code unreachable; if a connection is + * marked for close and flushing, there is no point in reading to it + * at all. Further, checking at this point is a bit of a hack: it + * would make much more sense to react in + * connection_handle_read_impl, or to just stop reading in + * mark_and_flush */ +#if 0 #define MARKED_READING_RATE 180 static ratelim_t marked_read_lim = RATELIM_INIT(MARKED_READING_RATE); char *m; @@ -870,6 +880,7 @@ conn_close_if_marked(int i) conn_state_to_string(conn->type, conn->state), m); tor_free(m); } +#endif conn->read_blocked_on_bw = 1; connection_stop_reading(conn); }

1 0

[tor/release-0.2.3] Fix a regression bug in AllowDotExit
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit c239c57d3c9a8ddff7db6ed20e836844b17efdae Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 19 19:45:28 2012 -0400 Fix a regression bug in AllowDotExit The code that detected the source of a remapped address checked that an address mapping's source was a given rewrite rule if addr_orig had no .exit, and addr did have a .exit after processing that rule. But addr_orig was formatted for logging: it was not the original address at all, but rather was the address escaped for logging and possibly replaced with "[scrubbed]". This new logic will correctly set ADDRMAPSRC_NONE in the case when the address starts life as a .exit address, so that AllowDotExit can work again. Fixes bug 6211; bugfix on 0.2.3.17-beta --- changes/bug6211 | 4 ++++ src/or/connection_edge.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/changes/bug6211 b/changes/bug6211 new file mode 100644 index 0000000..2c8d9b8 --- /dev/null +++ b/changes/bug6211 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a bug that stopped AllowDotExit from working on addresses + that had an entry in the DNS cache. Fixes bug 6211; bugfix on + 0.2.3.17-beta. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 210c2e0..9892078 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1100,8 +1100,8 @@ addressmap_match_superdomains(char *address) * address starts out as a non-exit address, and we remap it to an .exit * address at any point, then set *exit_source_out to the * address_entry_source_t of the first such rule. Set *exit_source_out - * to ADDRMAPSRC_NONE if there is no such rewrite. - * + * to ADDRMAPSRC_NONE if there is no such rewrite, or if the original address + * was a .exit. */ int addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, @@ -1111,10 +1111,12 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, int rewrites; time_t expires = TIME_MAX; addressmap_entry_source_t exit_source = ADDRMAPSRC_NONE; + char *addr_orig = tor_strdup(address); + char *log_addr_orig = NULL; for (rewrites = 0; rewrites < 16; rewrites++) { int exact_match = 0; - char *addr_orig = tor_strdup(escaped_safe_str_client(address)); + log_addr_orig = tor_strdup(escaped_safe_str_client(address)); ent = strmap_get(addressmap, address); @@ -1125,7 +1127,6 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, !strcasecmp(address, ent->new_address)) { /* This is a rule like *.example.com example.com, and we just got * "example.com" */ - tor_free(addr_orig); goto done; } @@ -1133,7 +1134,6 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, } if (!ent || !ent->new_address) { - tor_free(addr_orig); goto done; } @@ -1151,10 +1151,11 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, } log_info(LD_APP, "Addressmap: rewriting %s to %s", - addr_orig, escaped_safe_str_client(address)); + log_addr_orig, escaped_safe_str_client(address)); if (ent->expires > 1 && ent->expires < expires) expires = ent->expires; - tor_free(addr_orig); + + tor_free(log_addr_orig); } log_warn(LD_CONFIG, "Loop detected: we've rewritten %s 16 times! Using it as-is.", @@ -1162,6 +1163,8 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, /* it's fine to rewrite a rewrite, but don't loop forever */ done: + tor_free(addr_orig); + tor_free(log_addr_orig); if (exit_source_out) *exit_source_out = exit_source; if (expires_out)

1 0

[tor/release-0.2.3] Make format_helper_exit_status() avoid unnecessary spaces
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 4c62cc6f9997c215ff2687ce342e00d630d922c7 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Tue Jun 19 04:07:30 2012 -0700 Make format_helper_exit_status() avoid unnecessary spaces --- changes/bug5557 | 3 + src/common/util.c | 100 ++++++++++++++++++++++++++++++++++++++----------- src/test/test_util.c | 10 ++-- 3 files changed, 85 insertions(+), 28 deletions(-) diff --git a/changes/bug5557 b/changes/bug5557 new file mode 100644 index 0000000..c73fbe2 --- /dev/null +++ b/changes/bug5557 @@ -0,0 +1,3 @@ + o Minor bugfixes + - Make format_helper_exit_status() avoid unnecessary space padding and + stop confusing log_from_pipe(). Fixes ticket 5557. diff --git a/src/common/util.c b/src/common/util.c index 28ecff3..63a8aff 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3208,8 +3208,9 @@ void format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno) { - unsigned int unsigned_errno; - char *cur; + unsigned int unsigned_errno, len, tmp_uint; + char *cur, *tmp; + unsigned char tmp_uchar; size_t i; /* Fill hex_errno with spaces, and a trailing newline (memset may @@ -3225,35 +3226,88 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, unsigned_errno = (unsigned int) saved_errno; } - /* Convert errno to hex (start before \n) */ - cur = hex_errno + HEX_ERRNO_SIZE - 2; + /* How many chars do we need for child_state ? */ + if ( child_state > 0 ) { + len = 0; + tmp_uchar = child_state; + while (tmp_uchar > 0) { + tmp_uchar >>= 4; + ++len; + } + } + else len = 1; - /* Check for overflow on first iteration of the loop */ - if (cur < hex_errno) - return; + /* Bail if we would go past the end (on this or the '/') */ + if ( len + 2 > HEX_ERRNO_SIZE) + goto err; + + /* Point to last one */ + cur = hex_errno + len - 1; + /* Convert child_state to hex */ do { - *cur-- = "0123456789ABCDEF"[unsigned_errno % 16]; - unsigned_errno /= 16; - } while (unsigned_errno != 0 && cur >= hex_errno); + *cur-- = "0123456789ABCDEF"[child_state & 0xf]; + child_state >>= 4; + } while (child_state != 0 && cur >= hex_errno); - /* Prepend the minus sign if errno was negative */ - if (saved_errno < 0 && cur >= hex_errno) - *cur-- = '-'; + /* Check for overflow on first iteration of the loop */ + if (cur + 1 < hex_errno) + goto err; - /* Leave a gap */ - if (cur >= hex_errno) - *cur-- = '/'; + /* Now the '/' */ + hex_errno[len] = '/'; - /* Check for overflow on first iteration of the loop */ - if (cur < hex_errno) - return; + /* Save a pointer to the start of second number */ + tmp = hex_errno + len; - /* Convert child_state to hex */ + /* How many chars do we need for unsigned_errno? */ + if ( unsigned_errno > 0 ) { + len = 0; + tmp_uint = unsigned_errno; + while (tmp_uint > 0) { + tmp_uint >>= 4; + ++len; + } + } + else len = 1; + + /* Need minus? */ + if (saved_errno < 0) { + if ( tmp + 1 - hex_errno > (ptrdiff_t)(HEX_ERRNO_SIZE) ) + goto err; + + *(++tmp) = '-'; + } + + /* Last check for space */ + if ( tmp + len + 2 - hex_errno > (ptrdiff_t)(HEX_ERRNO_SIZE) ) + goto err; + + /* Point to last one */ + cur = tmp + len; + + /* Convert unsigned_errno to hex */ do { - *cur-- = "0123456789ABCDEF"[child_state % 16]; - child_state /= 16; - } while (child_state != 0 && cur >= hex_errno); + *cur-- = "0123456789ABCDEF"[unsigned_errno & 0xf]; + unsigned_errno >>= 4; + } while (unsigned_errno != 0 && cur >= tmp); + + /* Emit the newline and NUL */ + cur = tmp + len; + *(++cur) = '\n'; + *(++cur) = '\0'; + + goto done; + +err: + /* + * In error exit, just write a '\0' in the first char so whatever called + * this at least won't fall off the end. + */ + *hex_errno = '\0'; + +done: + return; } /* Maximum number of file descriptors, if we cannot get it via sysconf() */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 7484b9e..a3a5450 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2143,11 +2143,11 @@ test_util_exit_status(void *ptr) clear_hex_errno(hex_errno); format_helper_exit_status(0, 0, hex_errno); - test_streq(" 0/0\n", hex_errno); + test_streq("0/0\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0, 0x7FFFFFFF, hex_errno); - test_streq(" 0/7FFFFFFF\n", hex_errno); + test_streq("0/7FFFFFFF\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0xFF, -0x80000000, hex_errno); @@ -2155,11 +2155,11 @@ test_util_exit_status(void *ptr) clear_hex_errno(hex_errno); format_helper_exit_status(0x7F, 0, hex_errno); - test_streq(" 7F/0\n", hex_errno); + test_streq("7F/0\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0x08, -0x242, hex_errno); - test_streq(" 8/-242\n", hex_errno); + test_streq("8/-242\n", hex_errno); done: ; @@ -2357,7 +2357,7 @@ test_util_spawn_background_fail(void *ptr) tor_snprintf(code, sizeof(code), "%x/%x", 9 /* CHILD_STATE_FAILEXEC */ , ENOENT); tor_snprintf(expected_out, sizeof(expected_out), - "ERR: Failed to spawn background process - code %12s\n", code); + "ERR: Failed to spawn background process - code %s\n", code); run_util_spawn_background(argv, expected_out, expected_err, 255, expected_status);

1 0

[tor/release-0.2.3] Refactor unsigned int hex formatting out of format_helper_exit_status() in util.c
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit c21af69f29ca5a55385a926fdac4a8e6c8fb6d37 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 20 14:43:50 2012 -0700 Refactor unsigned int hex formatting out of format_helper_exit_status() in util.c --- src/common/util.c | 154 +++++++++++++++++++++++++++++++++-------------------- src/common/util.h | 2 + 2 files changed, 99 insertions(+), 57 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 63a8aff..79e7a70 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3191,6 +3191,61 @@ tor_join_win_cmdline(const char *argv[]) return joined_argv; } +/** + * Helper function to output hex numbers, called by + * format_helper_exit_status(). This writes the hexadecimal digits of x into + * buf, up to max_len digits, and returns the actual number of digits written. + * If there is insufficient space, it will write nothing and return 0. + * + * This accepts an unsigned int because format_helper_exit_status() needs to + * call it with a signed int and an unsigned char, and since the C standard + * does not guarantee that an int is wider than a char (an int must be at + * least 16 bits but it is permitted for a char to be that wide as well), we + * can't assume a signed int is sufficient to accomodate an unsigned char. + * Thus, format_helper_exit_status() will still need to emit any require '-' + * on its own. + */ + +int +format_hex_number_for_helper_exit_status(unsigned int x, char *buf, + int max_len) +{ + int len; + unsigned int tmp; + char *cur; + + /* Sanity check */ + if (!buf || max_len <= 0) + return 0; + + /* How many chars do we need for x? */ + if (x > 0) { + len = 0; + tmp = x; + while (tmp > 0) { + tmp >>= 4; + ++len; + } + } + else len = 1; + + /* Bail if we would go past the end of the buffer */ + if (len > max_len) + return 0; + + /* Point to last one */ + cur = buf + len - 1; + + /* Convert x to hex */ + do { + *cur-- = "0123456789ABCDEF"[x & 0xf]; + x >>= 4; + } while (x != 0 && cur >= buf); + + /* Return len */ + return len; +} + /** Format child_state and saved_errno as a hex string placed in * hex_errno. Called between fork and _exit, so must be signal-handler * safe. @@ -3208,9 +3263,9 @@ void format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno) { - unsigned int unsigned_errno, len, tmp_uint; - char *cur, *tmp; - unsigned char tmp_uchar; + unsigned int unsigned_errno; + int written, left; + char *cur; size_t i; /* Fill hex_errno with spaces, and a trailing newline (memset may @@ -3226,87 +3281,72 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, unsigned_errno = (unsigned int) saved_errno; } - /* How many chars do we need for child_state ? */ - if ( child_state > 0 ) { - len = 0; - tmp_uchar = child_state; - while (tmp_uchar > 0) { - tmp_uchar >>= 4; - ++len; - } - } - else len = 1; + /* + * Count how many chars of space we have left, and keep a pointer into the + * current point in the buffer. + */ + left = HEX_ERRNO_SIZE; + cur = hex_errno; - /* Bail if we would go past the end (on this or the '/') */ - if ( len + 2 > HEX_ERRNO_SIZE) + /* Emit child_state */ + written = format_hex_number_for_helper_exit_status(child_state, + cur, left); + if (written <= 0) goto err; - /* Point to last one */ - cur = hex_errno + len - 1; - - /* Convert child_state to hex */ - do { - *cur-- = "0123456789ABCDEF"[child_state & 0xf]; - child_state >>= 4; - } while (child_state != 0 && cur >= hex_errno); - - /* Check for overflow on first iteration of the loop */ - if (cur + 1 < hex_errno) + /* Adjust left and cur */ + left -= written; + cur += written; + if (left <= 0) goto err; /* Now the '/' */ - hex_errno[len] = '/'; - - /* Save a pointer to the start of second number */ - tmp = hex_errno + len; + *cur = '/'; - /* How many chars do we need for unsigned_errno? */ - if ( unsigned_errno > 0 ) { - len = 0; - tmp_uint = unsigned_errno; - while (tmp_uint > 0) { - tmp_uint >>= 4; - ++len; - } - } - else len = 1; + /* Adjust left and cur */ + ++cur; + --left; + if (left <= 0) + goto err; /* Need minus? */ if (saved_errno < 0) { - if ( tmp + 1 - hex_errno > (ptrdiff_t)(HEX_ERRNO_SIZE) ) + *cur = '-'; + ++cur; + --left; + if (left <= 0) goto err; - - *(++tmp) = '-'; } - /* Last check for space */ - if ( tmp + len + 2 - hex_errno > (ptrdiff_t)(HEX_ERRNO_SIZE) ) + /* Emit unsigned_errno */ + written = format_hex_number_for_helper_exit_status(unsigned_errno, + cur, left); + + if (written <= 0) goto err; - /* Point to last one */ - cur = tmp + len; + /* Adjust left and cur */ + left -= written; + cur += written; - /* Convert unsigned_errno to hex */ - do { - *cur-- = "0123456789ABCDEF"[unsigned_errno & 0xf]; - unsigned_errno >>= 4; - } while (unsigned_errno != 0 && cur >= tmp); + /* Check that we have enough space left for a newline */ + if (left <= 0) + goto err; /* Emit the newline and NUL */ - cur = tmp + len; - *(++cur) = '\n'; - *(++cur) = '\0'; + *cur++ = '\n'; + *cur++ = '\0'; goto done; -err: + err: /* * In error exit, just write a '\0' in the first char so whatever called * this at least won't fall off the end. */ *hex_errno = '\0'; -done: + done: return; } diff --git a/src/common/util.h b/src/common/util.h index a2b196c..6b7c6fb 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -471,6 +471,8 @@ void tor_process_handle_destroy(process_handle_t *process_handle, #ifdef UTIL_PRIVATE /* Prototypes for private functions only used by util.c (and unit tests) */ +int format_hex_number_for_helper_exit_status(unsigned int x, char *buf, + int max_len); void format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno);

1 0

[tor/release-0.2.3] Add unit test for format_hex_number_for_helper_exit_status()
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 770374a6b3e6a60b65cf9616755b018f93a17d26 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 20 18:38:07 2012 -0700 Add unit test for format_hex_number_for_helper_exit_status() --- src/test/test_util.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index a3a5450..d71d280 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2465,6 +2465,44 @@ test_util_spawn_background_partial_read(void *ptr) } /** + * Test for format_hex_number_for_helper_exit_status() + */ + +static void +test_util_format_hex_number(void *ptr) +{ + int i, len; + char buf[HEX_ERRNO_SIZE + 1]; + const struct { + const char *str; + unsigned int x; + } test_data[] = { + {"0", 0}, + {"1", 1}, + {"273A", 0x273a}, + {"FFFF", 0xffff}, +#if UINT_MAX >= 0xffffffff + {"31BC421D", 0x31bc421d}, + {"FFFFFFFF", 0xffffffff}, +#endif + {NULL, 0} + }; + + (void)ptr; + + for (i = 0; test_data[i].str != NULL; ++i) { + len = format_hex_number_for_helper_exit_status(test_data[i].x, + buf, HEX_ERRNO_SIZE); + test_neq(len, 0); + buf[len] = '\0'; + test_streq(buf, test_data[i].str); + } + + done: + return; +} + +/** * Test that we can properly format q Windows command line */ static void @@ -3031,6 +3069,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(spawn_background_ok, 0), UTIL_TEST(spawn_background_fail, 0), UTIL_TEST(spawn_background_partial_read, 0), + UTIL_TEST(format_hex_number, 0), UTIL_TEST(join_win_cmdline, 0), UTIL_TEST(split_lines, 0), UTIL_TEST(n_bits_set, 0),

1 0

[tor/release-0.2.3] Style tweaks and add a warning about NUL-termination
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 4a7e4129af6db990b9672b6d4f013b2e59aa81b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:17:24 2012 -0400 Style tweaks and add a warning about NUL-termination --- src/common/util.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 79e7a70..cb8ff85 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3197,6 +3197,9 @@ tor_join_win_cmdline(const char *argv[]) * buf, up to max_len digits, and returns the actual number of digits written. * If there is insufficient space, it will write nothing and return 0. * + * This function DOES NOT add a terminating NUL character to its output: be + * careful! + * * This accepts an unsigned int because format_helper_exit_status() needs to * call it with a signed int and an unsigned char, and since the C standard * does not guarantee that an int is wider than a char (an int must be at @@ -3204,8 +3207,11 @@ tor_join_win_cmdline(const char *argv[]) * can't assume a signed int is sufficient to accomodate an unsigned char. * Thus, format_helper_exit_status() will still need to emit any require '-' * on its own. + * + * For most purposes, you'd want to use tor_snprintf("%x") instead of this + * function; it's designed to be used in code paths where you can't call + * arbitrary C functions. */ - int format_hex_number_for_helper_exit_status(unsigned int x, char *buf, int max_len) @@ -3226,8 +3232,9 @@ format_hex_number_for_helper_exit_status(unsigned int x, char *buf, tmp >>= 4; ++len; } + } else { + len = 1; } - else len = 1; /* Bail if we would go past the end of the buffer */ if (len > max_len) @@ -3258,7 +3265,6 @@ format_hex_number_for_helper_exit_status(unsigned int x, char *buf, * CHILD_STATE_* macros for definition), and SAVED_ERRNO is the value of * errno when the failure occurred. */ - void format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno)

1 0