- tor-commits - lists.torproject.org

[stem/master] Integ tests for launch_tor
by atagar＠torproject.org 11 May '12

11 May '12

commit bfb3973049c72a9bd6de951566417eca7e132e70 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 11 09:28:51 2012 -0700 Integ tests for launch_tor I've been leaving launch_tor untested because it was exercised in order to run the integ tests and any tests involving it would take a long time, on the order of a dozen seconds! Hey, it's a long time when you run this as often as I do... It's an important function and has more options than what's exercised for running integ tests so adding some tests for it. --- run_tests.py | 2 + test/integ/__init__.py | 2 +- test/integ/process.py | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9ee6042..818bfb8 100755 --- a/run_tests.py +++ b/run_tests.py @@ -37,6 +37,7 @@ import test.integ.descriptor.reader import test.integ.descriptor.server_descriptor import test.integ.util.conf import test.integ.util.system +import test.integ.process import test.integ.version import stem.util.conf @@ -106,6 +107,7 @@ INTEG_TESTS = ( test.integ.descriptor.reader.TestDescriptorReader, test.integ.descriptor.server_descriptor.TestServerDescriptor, test.integ.version.TestVersion, + test.integ.process.TestProcess, test.integ.socket.control_socket.TestControlSocket, test.integ.socket.control_message.TestControlMessage, test.integ.connection.protocolinfo.TestProtocolInfo, diff --git a/test/integ/__init__.py b/test/integ/__init__.py index a50d3f3..a9bb9ef 100644 --- a/test/integ/__init__.py +++ b/test/integ/__init__.py @@ -2,5 +2,5 @@ Integration tests for the stem library. """ -__all__ = ["connection", "control", "descriptor", "socket", "util", "version"] +__all__ = ["connection", "control", "descriptor", "process", "socket", "util", "version"] diff --git a/test/integ/process.py b/test/integ/process.py new file mode 100644 index 0000000..b03fb27 --- /dev/null +++ b/test/integ/process.py @@ -0,0 +1,65 @@ +""" +Tests the stem.process functions with various use cases. +""" + +import time +import unittest + +import stem.socket +import stem.process +import test.runner + +# Tests are target independent. Only run once even if there's multiple targets. + +RAN_TESTS = [] + +class TestProcess(unittest.TestCase): + def test_launch_tor_options(self): + """ + Runs launch_tor with options specified via the commandline rather than the + torrc. + """ + + test_name = 'test_launch_tor_options' + if test_name in RAN_TESTS: self.skipTest("(already ran)") + + # Launch tor without a torrc, but with a control port. Confirms that this + # works by checking that we're still able to access the new instance. + + tor_process = stem.process.launch_tor( + options = {'SocksPort': '2777', 'ControlPort': '2778'}, + torrc_path = stem.process.NO_TORRC, + completion_percent = 5 + ) + + control_socket = None + try: + control_socket = stem.socket.ControlPort(control_port = 2778) + runner = test.runner.get_runner() + stem.connection.authenticate(control_socket, chroot_path = runner.get_chroot()) + + # exercises the socket + control_socket.send("GETINFO version") + version_response = control_socket.recv() + self.assertEquals("version=%s\nOK" % runner.get_tor_version(), str(version_response)) + finally: + if control_socket: control_socket.close() + tor_process.kill() + + RAN_TESTS.append(test_name) + + def test_launch_tor_with_timeout(self): + """ + Runs launch_tor where it times out before completing. + """ + + test_name = 'test_launch_tor_with_timeout' + if test_name in RAN_TESTS: self.skipTest("(already ran)") + + start_time = time.time() + self.assertRaises(OSError, stem.process.launch_tor, "tor", {'SocksPort': '2777'}, stem.process.NO_TORRC, 100, None, 2) + runtime = time.time() - start_time + self.assertTrue(runtime > 2 and runtime < 3) + + RAN_TESTS.append(test_name) +

1 0

[tor/master] Generalize fmt_addr() to support IPv6 decorations.
by nickm＠torproject.org 11 May '12

11 May '12

commit da6e0993dc4a0037933a522e2f578c145f6538cc Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 13:48:20 2012 +0200 Generalize fmt_addr() to support IPv6 decorations. --- src/common/address.c | 4 ++-- src/common/address.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 676c485..62cf16c 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -991,11 +991,11 @@ tor_dup_addr(const tor_addr_t *addr) * fmt_addr invalidates the last result of the function. This * function is not thread-safe. */ const char * -fmt_addr(const tor_addr_t *addr) +fmt_addr_impl(const tor_addr_t *addr, int decorate) { static char buf[TOR_ADDR_BUF_LEN]; if (!addr) return "<null>"; - if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) + if (tor_addr_to_str(buf, addr, sizeof(buf), decorate)) return buf; else return "???"; diff --git a/src/common/address.h b/src/common/address.h index ede035d..bdb14eb 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -135,7 +135,9 @@ tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u) int tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr_out); char *tor_dup_addr(const tor_addr_t *addr) ATTR_MALLOC; -const char *fmt_addr(const tor_addr_t *addr); +#define fmt_addr(a) fmt_addr_impl(a, 0) +#define fmt_and_decorate_addr(a) fmt_addr_impl(a, 1) +const char *fmt_addr_impl(const tor_addr_t *addr, int decorate); const char * fmt_addr32(uint32_t addr); int get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr);

1 0

[tor/master] Introduce and use router_get_active_listener_port_by_type().
by nickm＠torproject.org 11 May '12

11 May '12

commit fedf76a2e6452124c38ecc51cea6567b9d5cc23d Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 13:54:09 2012 +0200 Introduce and use router_get_active_listener_port_by_type(). router_get_active_listener_port_by_type() iterates all connections, trying to find a listener of a specific type, and returns its TCP port. --- src/or/router.c | 35 +++++++++++++++++++++++------------ src/or/router.h | 1 + 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index bf15689..67d26e1 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1216,6 +1216,20 @@ consider_publishable_server(int force) } } +/** Return the port of the first active listener of type + * listener_type. */ +uint16_t +router_get_active_listener_port_by_type(int listener_type) +{ + /* Iterate all connections, find one of the right kind and return + the port. Not very sophisticated or fast, but effective. */ + const connection_t *c = connection_get_by_type(listener_type); + if (c) + return c->port; + + return 0; +} + /** Return the port that we should advertise as our ORPort; this is either * the one configured in the ORPort option, or the one we actually bound to * if ORPort is "auto". @@ -1226,12 +1240,11 @@ router_get_advertised_or_port(const or_options_t *options) int port = get_primary_or_port(); (void)options; - if (port == CFG_AUTO_PORT) { - connection_t *c = connection_get_by_type(CONN_TYPE_OR_LISTENER); - if (c) - return c->port; - return 0; - } + /* If the port is in 'auto' mode, we have to use + router_get_listener_port_by_type(). */ + if (port == CFG_AUTO_PORT) + return router_get_active_listener_port_by_type(CONN_TYPE_OR_LISTENER); + return port; } @@ -1248,12 +1261,10 @@ router_get_advertised_dir_port(const or_options_t *options, uint16_t dirport) if (!dirport_configured) return dirport; - if (dirport_configured == CFG_AUTO_PORT) { - connection_t *c = connection_get_by_type(CONN_TYPE_DIR_LISTENER); - if (c) - return c->port; - return 0; - } + + if (dirport_configured == CFG_AUTO_PORT) + return router_get_active_listener_port_by_type(CONN_TYPE_DIR_LISTENER); + return dirport_configured; } diff --git a/src/or/router.h b/src/or/router.h index fb91434..294736e 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -53,6 +53,7 @@ int authdir_mode_publishes_statuses(const or_options_t *options); int authdir_mode_tests_reachability(const or_options_t *options); int authdir_mode_bridge(const or_options_t *options); +uint16_t router_get_active_listener_port_by_type(int listener_type); uint16_t router_get_advertised_or_port(const or_options_t *options); uint16_t router_get_advertised_dir_port(const or_options_t *options, uint16_t dirport);

1 0

[tor/master] Pass OR address to PT proxy, even with IPv6 or ORListenAddress.
by nickm＠torproject.org 11 May '12

11 May '12

commit 10232dc0423792a8fb61b9ec136d7ffd5484216b Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 14:04:58 2012 +0200 Pass OR address to PT proxy, even with IPv6 or ORListenAddress. Introduce get_first_listener_addrport_for_pt() which returns a string containing the addrport of the first listener we could find. Use it to form the TOR_PT_ORPORT managed proxy protocol line. --- src/or/config.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/config.h | 2 + src/or/transports.c | 9 ++++--- 3 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 2a8c540..5ea1f5e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6026,6 +6026,59 @@ get_configured_ports(void) return configured_ports; } +/** Return an <address>:<port> string representation of the address + * where the first listener_type listener waits for + * connections. Return NULL if we couldn't find a listener. The + * string is allocated on the heap and it's the responsibility of the + * caller to free it after use. + * + * This function is meant to be used by the pluggable transport proxy + * spawning code. */ +char * +get_first_listener_addrport_for_pt(int listener_type) +{ + static const char *ipv4_localhost = "127.0.0.1"; + static const char *ipv6_localhost = "[::1]"; + const char *address; + uint16_t port; + char *string = NULL; + + if (!configured_ports) + return NULL; + + SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) { + + if (cfg->type == listener_type && + tor_addr_family(&cfg->addr) != AF_UNSPEC) { + + /* We found the first listener of the type we are interested in! */ + + /* If a listener is listening on INADDR_ANY, assume that it's + also listening on 127.0.0.1, and point the transport proxy + there: */ + if (tor_addr_is_null(&cfg->addr)) + address = tor_addr_is_v4(&cfg->addr) ? ipv4_localhost : ipv6_localhost; + else + address = fmt_and_decorate_addr(&cfg->addr); + + /* If a listener is configured with port 'auto', we are forced + to iterate all listener connections and find out in which + port it ended up listening: */ + if (cfg->port == CFG_AUTO_PORT) + port = router_get_active_listener_port_by_type(listener_type); + else + port = cfg->port; + + tor_asprintf(&string, "%s:%u", address, port); + + return string; + } + + } SMARTLIST_FOREACH_END(cfg); + + return NULL; +} + /** Return the first advertised port of type listener_type in address_family. */ int diff --git a/src/or/config.h b/src/or/config.h index 0f7c618..fd84d9b 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -72,6 +72,8 @@ int get_first_advertised_port_by_type_af(int listener_type, #define get_primary_dir_port() \ (get_first_advertised_port_by_type_af(CONN_TYPE_DIR_LISTENER, AF_INET)) +char *get_first_listener_addrport_for_pt(int listener_type); + int options_need_geoip_info(const or_options_t *options, const char **reason_out); diff --git a/src/or/transports.c b/src/or/transports.c index 564603e..1f21493 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -957,8 +957,6 @@ get_bindaddr_for_server_proxy(const managed_proxy_t *mp) static process_environment_t * create_managed_proxy_environment(const managed_proxy_t *mp) { - const or_options_t *options = get_options(); - /* Environment variables to be added to or set in mp's environment. */ smartlist_t *envs = smartlist_new(); /* XXXX The next time someone touches this code, shorten the name of @@ -993,8 +991,11 @@ create_managed_proxy_environment(const managed_proxy_t *mp) } if (mp->is_server) { - smartlist_add_asprintf(envs, "TOR_PT_ORPORT=127.0.0.1:%s", - options->ORPort->value); + { + char *orport_tmp = get_first_listener_addrport_for_pt(CONN_TYPE_OR_LISTENER); + smartlist_add_asprintf(envs, "TOR_PT_ORPORT=%s", orport_tmp); + tor_free(orport_tmp); + } { char *bindaddr_tmp = get_bindaddr_for_server_proxy(mp);

1 0

[tor/master] Add changes file for #4865.
by nickm＠torproject.org 11 May '12

11 May '12

commit b03f90b5383744593dc1e83fc5834c965573a4dc Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 14:05:12 2012 +0200 Add changes file for #4865. --- changes/bug4865 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug4865 b/changes/bug4865 new file mode 100644 index 0000000..e165c41 --- /dev/null +++ b/changes/bug4865 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Pass correct OR address to managed proxies, even when + ORListenAddress is used. Fixes bug #4865; bugfix on + 0.2.3.9-alpha.

1 0

[tor/master] Fix issues found by nickm.
by nickm＠torproject.org 11 May '12

11 May '12

commit 6d2898607bd831944c6c15b6e15200a426149811 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 12 22:42:37 2012 +0200 Fix issues found by nickm. * Document fmt_addr_impl() and friends. * Parenthesize macro arguments. * Rename get_first_listener_addrport_for_pt() to get_first_listener_addrport_string(). * Handle port_cfg_t with no_listen. * Handle failure of router_get_active_listener_port_by_type(). * Add an XXX to router_get_active_listener_port_by_type(). --- src/common/address.c | 13 +++++++++---- src/common/address.h | 9 +++++++-- src/or/config.c | 14 ++++++++++---- src/or/config.h | 2 +- src/or/router.c | 2 ++ src/or/transports.c | 2 +- 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 62cf16c..7f78d1e 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -986,10 +986,15 @@ tor_dup_addr(const tor_addr_t *addr) } } -/** Return a string representing the address addr. This string is - * statically allocated, and must not be freed. Each call to - * fmt_addr invalidates the last result of the function. This - * function is not thread-safe. */ +/** Return a string representing the address addr. This string + * is statically allocated, and must not be freed. Each call to + * fmt_addr_impl invalidates the last result of the function. + * This function is not thread-safe. If decorate is set, add + * brackets to IPv6 addresses. + * + * It's better to use the wrapper macros of this function: + * fmt_addr() and fmt_and_decorate_addr(). + */ const char * fmt_addr_impl(const tor_addr_t *addr, int decorate) { diff --git a/src/common/address.h b/src/common/address.h index bdb14eb..761eed6 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -135,8 +135,13 @@ tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u) int tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr_out); char *tor_dup_addr(const tor_addr_t *addr) ATTR_MALLOC; -#define fmt_addr(a) fmt_addr_impl(a, 0) -#define fmt_and_decorate_addr(a) fmt_addr_impl(a, 1) + +/** Wrapper function of fmt_addr_impl(). It does not decorate IPv6 + * addresses. */ +#define fmt_addr(a) fmt_addr_impl((a), 0) +/** Wrapper function of fmt_addr_impl(). It decorates IPv6 + * addresses. */ +#define fmt_and_decorate_addr(a) fmt_addr_impl((a), 1) const char *fmt_addr_impl(const tor_addr_t *addr, int decorate); const char * fmt_addr32(uint32_t addr); int get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr); diff --git a/src/or/config.c b/src/or/config.c index 5ea1f5e..3fc543c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6033,9 +6033,10 @@ get_configured_ports(void) * caller to free it after use. * * This function is meant to be used by the pluggable transport proxy - * spawning code. */ + * spawning code, please make sure that it fits your purposes before + * using it. */ char * -get_first_listener_addrport_for_pt(int listener_type) +get_first_listener_addrport_string(int listener_type) { static const char *ipv4_localhost = "127.0.0.1"; static const char *ipv6_localhost = "[::1]"; @@ -6047,6 +6048,8 @@ get_first_listener_addrport_for_pt(int listener_type) return NULL; SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) { + if (cfg->no_listen) + continue; if (cfg->type == listener_type && tor_addr_family(&cfg->addr) != AF_UNSPEC) { @@ -6064,10 +6067,13 @@ get_first_listener_addrport_for_pt(int listener_type) /* If a listener is configured with port 'auto', we are forced to iterate all listener connections and find out in which port it ended up listening: */ - if (cfg->port == CFG_AUTO_PORT) + if (cfg->port == CFG_AUTO_PORT) { port = router_get_active_listener_port_by_type(listener_type); - else + if (!port) + return NULL; + } else { port = cfg->port; + } tor_asprintf(&string, "%s:%u", address, port); diff --git a/src/or/config.h b/src/or/config.h index fd84d9b..0495186 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -72,7 +72,7 @@ int get_first_advertised_port_by_type_af(int listener_type, #define get_primary_dir_port() \ (get_first_advertised_port_by_type_af(CONN_TYPE_DIR_LISTENER, AF_INET)) -char *get_first_listener_addrport_for_pt(int listener_type); +char *get_first_listener_addrport_string(int listener_type); int options_need_geoip_info(const or_options_t *options, const char **reason_out); diff --git a/src/or/router.c b/src/or/router.c index 67d26e1..3b97d28 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1218,6 +1218,8 @@ consider_publishable_server(int force) /** Return the port of the first active listener of type * listener_type. */ +/** XXX not a very good interface. it's not reliable when there are + multiple listeners. */ uint16_t router_get_active_listener_port_by_type(int listener_type) { diff --git a/src/or/transports.c b/src/or/transports.c index 1f21493..8976450 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -992,7 +992,7 @@ create_managed_proxy_environment(const managed_proxy_t *mp) if (mp->is_server) { { - char *orport_tmp = get_first_listener_addrport_for_pt(CONN_TYPE_OR_LISTENER); + char *orport_tmp = get_first_listener_addrport_string(CONN_TYPE_OR_LISTENER); smartlist_add_asprintf(envs, "TOR_PT_ORPORT=%s", orport_tmp); tor_free(orport_tmp); }

1 0

[tor/master] Merge remote-tracking branch 'asn/bug4865_take2'
by nickm＠torproject.org 11 May '12

11 May '12

commit e0655708a20069a5f42476a25d62e9d3f8138d8c Merge: 84ddc4b 6d28986 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 11:52:51 2012 -0400 Merge remote-tracking branch 'asn/bug4865_take2' changes/bug4865 | 4 +++ src/common/address.c | 17 +++++++++----- src/common/address.h | 9 ++++++- src/or/config.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/config.h | 2 + src/or/router.c | 37 +++++++++++++++++++++---------- src/or/router.h | 1 + src/or/transports.c | 9 ++++--- 8 files changed, 115 insertions(+), 23 deletions(-)

1 0

[tor/master] Fix tor_strtok_r_impl and test cases per bug #5091
by nickm＠torproject.org 11 May '12

11 May '12

commit efb8a09f41fcd4c48bffdc98ae8d5e0002a0bb88 Author: nils <nils(a)shkoo.com> Date: Fri Mar 30 11:01:21 2012 -0400 Fix tor_strtok_r_impl and test cases per bug #5091 == Nick here. I tweaked this patch a little to make it apply cleanly to master, to extract some common code into a function, and to replace snprintf with tor_snprintf. -- nickm --- changes/bug5091 | 4 +++ src/common/compat.c | 30 +++++++++++++++++---- src/test/test_util.c | 70 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 74 insertions(+), 30 deletions(-) diff --git a/changes/bug5091 b/changes/bug5091 new file mode 100644 index 0000000..b9778d7 --- /dev/null +++ b/changes/bug5091 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Make our replacement implementation of strtok_r compatible with + the standard behavior of strtok_r. Patch by nils. Fixes bug + 5091; bugfix on 0.2.2.1-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index 30bde3d..bd68225 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -546,25 +546,43 @@ const char TOR_TOLOWER_TABLE[256] = { 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255, }; +/** Helper for tor_strtok_r_impl: Advances cp past all characters in + * sep, and returns its new value. */ +static char * +strtok_helper(char *cp, const char *sep) +{ + if (sep[1]) { + while (*cp && strchr(sep, *cp)) + ++cp; + } else { + while (*cp && *cp == *sep) + ++cp; + } + return cp; +} + /** Implementation of strtok_r for platforms whose coders haven't figured out * how to write one. Hey guys! You can use this code here for free! */ char * tor_strtok_r_impl(char *str, const char *sep, char **lasts) { char *cp, *start; - if (str) + tor_assert(*sep); + if (str) { + str = strtok_helper(str, sep); + if (!*str) + return NULL; start = cp = *lasts = str; - else if (!*lasts) + } else if (!*lasts || !**lasts) { return NULL; - else + } else { start = cp = *lasts; + } - tor_assert(*sep); if (sep[1]) { while (*cp && !strchr(sep, *cp)) ++cp; } else { - tor_assert(strlen(sep) == 1); cp = strchr(cp, *sep); } @@ -572,7 +590,7 @@ tor_strtok_r_impl(char *str, const char *sep, char **lasts) *lasts = NULL; } else { *cp++ = '\0'; - *lasts = cp; + *lasts = strtok_helper(cp, sep); } return start; } diff --git a/src/test/test_util.c b/src/test/test_util.c index 88f00e0..3cbc5bf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1735,32 +1735,56 @@ test_util_strtok(void) { char buf[128]; char buf2[128]; + int i; char *cp1, *cp2; - strlcpy(buf, "Graved on the dark in gestures of descent", sizeof(buf)); - strlcpy(buf2, "they.seemed;their!own;most.perfect;monument", sizeof(buf2)); - /* -- "Year's End", Richard Wilbur */ - test_streq("Graved", tor_strtok_r_impl(buf, " ", &cp1)); - test_streq("they", tor_strtok_r_impl(buf2, ".!..;!", &cp2)); + for (i = 0; i < 3; i++) { + const char *pad1, *pad2; + switch (i) { + case 0: + pad1 = pad2 = ""; + break; + case 1: + pad1 = " "; + pad2 = "!"; + break; + case 2: + pad1 = " "; + pad2 = ";!"; + break; + } + tor_snprintf(buf, sizeof(buf), "%s", pad1); + tor_snprintf(buf2, sizeof(buf2), "%s", pad2); + test_assert(NULL == tor_strtok_r_impl(buf, " ", &cp1)); + test_assert(NULL == tor_strtok_r_impl(buf2, ".!..;!", &cp2)); + + tor_snprintf(buf, sizeof(buf), + "%sGraved on the dark in gestures of descent%s", pad1, pad1); + tor_snprintf(buf2, sizeof(buf2), + "%sthey.seemed;;their!.own;most.perfect;monument%s",pad2,pad2); + /* -- "Year's End", Richard Wilbur */ + + test_streq("Graved", tor_strtok_r_impl(buf, " ", &cp1)); + test_streq("they", tor_strtok_r_impl(buf2, ".!..;!", &cp2)); #define S1() tor_strtok_r_impl(NULL, " ", &cp1) #define S2() tor_strtok_r_impl(NULL, ".!..;!", &cp2) - test_streq("on", S1()); - test_streq("the", S1()); - test_streq("dark", S1()); - test_streq("seemed", S2()); - test_streq("their", S2()); - test_streq("own", S2()); - test_streq("in", S1()); - test_streq("gestures", S1()); - test_streq("of", S1()); - test_streq("most", S2()); - test_streq("perfect", S2()); - test_streq("descent", S1()); - test_streq("monument", S2()); - test_eq_ptr(NULL, S1()); - test_eq_ptr(NULL, S2()); + test_streq("on", S1()); + test_streq("the", S1()); + test_streq("dark", S1()); + test_streq("seemed", S2()); + test_streq("their", S2()); + test_streq("own", S2()); + test_streq("in", S1()); + test_streq("gestures", S1()); + test_streq("of", S1()); + test_streq("most", S2()); + test_streq("perfect", S2()); + test_streq("descent", S1()); + test_streq("monument", S2()); + test_eq_ptr(NULL, S1()); + test_eq_ptr(NULL, S2()); + } -#if 0 buf[0] = 0; test_eq_ptr(NULL, tor_strtok_r_impl(buf, " ", &cp1)); test_eq_ptr(NULL, tor_strtok_r_impl(buf, "!", &cp1)); @@ -1773,12 +1797,10 @@ test_util_strtok(void) test_eq_ptr(NULL, tor_strtok_r_impl(buf, " ", &cp1)); strlcpy(buf, " ", sizeof(buf)); test_eq_ptr(NULL, tor_strtok_r_impl(buf, " ", &cp1)); -#endif strlcpy(buf, "something ", sizeof(buf)); test_streq("something", tor_strtok_r_impl(buf, " ", &cp1)); - test_streq(" ", tor_strtok_r_impl(NULL, ";", &cp1)); - test_eq_ptr(NULL, tor_strtok_r_impl(NULL, " ", &cp1)); + test_eq_ptr(NULL, tor_strtok_r_impl(NULL, ";", &cp1)); done: ; }

1 0

[tor/master] Merge remote-tracking branch 'public/bug5091'
by nickm＠torproject.org 11 May '12

11 May '12

commit 84ddc4b6aad392dd9a735580caf6fb68e3694d42 Merge: 648db9a efb8a09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 11:45:40 2012 -0400 Merge remote-tracking branch 'public/bug5091' changes/bug5091 | 4 +++ src/common/compat.c | 30 +++++++++++++++++---- src/test/test_util.c | 70 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 74 insertions(+), 30 deletions(-)

1 0

[torbrowser/maint-2.2] bump openssl to 1.0.1c for new packages
by erinn＠torproject.org 11 May '12

11 May '12

commit 18dd7c3c790aaaa5aacc436ab7bd996163b2bcf1 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 10:50:54 2012 -0300 bump openssl to 1.0.1c for new packages --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 7920977..eda1b90 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 ZLIB_VER=1.2.6 -OPENSSL_VER=1.0.1b +OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17

1 0