- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Fix unit test failure in dir/formats
by nickm＠torproject.org 02 Jun '11

02 Jun '11

commit df42eb0a18a9f6fe4b729a1c9a63bb6ab247f631 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jun 2 13:30:32 2011 +0200 Fix unit test failure in dir/formats options->DirPort is 0 in the unit tests, so router_get_advertised_dir_port() would return 0 so we wouldn't pick a dirport. This isn't what we want for the unit tests. Fixes bug introduced in 95ac3ea5946. --- src/or/connection.c | 4 ++-- src/or/dirserv.c | 5 +++-- src/or/router.c | 18 +++++++++++------- src/or/router.h | 3 ++- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 3dcb573..3f4ca1d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1952,7 +1952,7 @@ retry_all_listeners(smartlist_t *replaced_conns, or_options_t *options = get_options(); int retval = 0; const uint16_t old_or_port = router_get_advertised_or_port(options); - const uint16_t old_dir_port = router_get_advertised_dir_port(options); + const uint16_t old_dir_port = router_get_advertised_dir_port(options, 0); if (retry_listeners(CONN_TYPE_OR_LISTENER, options->ORListenAddress, options->ORPort, "0.0.0.0", @@ -1998,7 +1998,7 @@ retry_all_listeners(smartlist_t *replaced_conns, return -1; if (old_or_port != router_get_advertised_or_port(options) || - old_dir_port != router_get_advertised_dir_port(options)) { + old_dir_port != router_get_advertised_dir_port(options, 0)) { /* Our chosen ORPort or DirPort is not what it used to be: the * descriptor we had (if any) should be regenerated. (We won't * automatically notice this because of changes in the option, diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e9355fe..d114d86 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2705,7 +2705,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, voter->sigs = smartlist_create(); voter->address = hostname; voter->addr = addr; - voter->dir_port = router_get_advertised_dir_port(options); + voter->dir_port = router_get_advertised_dir_port(options, 0); voter->or_port = router_get_advertised_or_port(options); voter->contact = tor_strdup(contact); if (options->V3AuthUseLegacyKey) { @@ -2812,7 +2812,8 @@ generate_v2_networkstatus_opinion(void) "dir-options%s%s%s%s\n" "%s" /* client version line, server version line. */ "dir-signing-key\n%s", - hostname, ipaddr, (int)router_get_advertised_dir_port(options), + hostname, ipaddr, + (int)router_get_advertised_dir_port(options, 0), fingerprint, contact, published, diff --git a/src/or/router.c b/src/or/router.c index 30a340a..68e29bb 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -704,7 +704,7 @@ init_keys(void) ds = router_get_trusteddirserver_by_digest(digest); if (!ds) { ds = add_trusted_dir_server(options->Nickname, NULL, - router_get_advertised_dir_port(options), + router_get_advertised_dir_port(options, 0), router_get_advertised_or_port(options), digest, v3_digest, @@ -802,7 +802,7 @@ decide_to_advertise_dirport(or_options_t *options, uint16_t dir_port) return 0; if (!check_whether_dirport_reachable()) return 0; - if (!router_get_advertised_dir_port(options)) + if (!router_get_advertised_dir_port(options, dir_port)) return 0; /* Section two: reasons to publish or not publish that the user @@ -1184,12 +1184,16 @@ router_get_advertised_or_port(or_options_t *options) return options->ORPort; } -/** Return the port that we should advertise as our DirPort; this is either - * the one configured in the DirPort option, or the one we actually bound to - * if DirPort is "auto". */ +/** Return the port that we should advertise as our DirPort; + * this is one of three possibilities: + * The one that is passed as <b>dirport</b> if the DirPort option is 0, or + * the one configured in the DirPort option, + * or the one we actually bound to if DirPort is "auto". */ uint16_t -router_get_advertised_dir_port(or_options_t *options) +router_get_advertised_dir_port(or_options_t *options, uint16_t dirport) { + if (!options->DirPort) + return dirport; if (options->DirPort == CFG_AUTO_PORT) { connection_t *c = connection_get_by_type(CONN_TYPE_DIR_LISTENER); if (c) @@ -1440,7 +1444,7 @@ router_rebuild_descriptor(int force) ri->nickname = tor_strdup(options->Nickname); ri->addr = addr; ri->or_port = router_get_advertised_or_port(options); - ri->dir_port = router_get_advertised_dir_port(options); + ri->dir_port = router_get_advertised_dir_port(options, 0); ri->cache_info.published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from * main thread */ diff --git a/src/or/router.h b/src/or/router.h index a27c1d9..3733099 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -51,7 +51,8 @@ int authdir_mode_tests_reachability(or_options_t *options); int authdir_mode_bridge(or_options_t *options); uint16_t router_get_advertised_or_port(or_options_t *options); -uint16_t router_get_advertised_dir_port(or_options_t *options); +uint16_t router_get_advertised_dir_port(or_options_t *options, + uint16_t dirport); int server_mode(or_options_t *options); int public_server_mode(or_options_t *options);

1 0

[tor/master] Unbreak the build
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit 9ac2f63e0f3f1fd333b23ee6e6c02ae7cf0f71d2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jun 1 09:39:27 2011 -0700 Unbreak the build --- src/or/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 7d9a85a..5b38edb 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -225,7 +225,7 @@ connection_add_impl(connection_t *conn, int is_connecting) connection_configure_bufferevent_callbacks(conn); } else if (conn->linked && conn->linked_conn && connection_type_uses_bufferevent(conn->linked_conn)) { - tor_assert(!(SOCKET_OK(conn->s)); + tor_assert(!(SOCKET_OK(conn->s))); if (!conn->bufev) { struct bufferevent *pair[2] = { NULL, NULL }; if (bufferevent_pair_new(tor_libevent_get_base(),

1 0

[obfsproxy/master] Fix a crash when starting in socks mode.
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit b1e2ee5f84366034edea3cdc04092d6bab92a809 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 12:02:44 2011 -0400 Fix a crash when starting in socks mode. --- src/main.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 8af4934..de63882 100644 --- a/src/main.c +++ b/src/main.c @@ -86,9 +86,13 @@ main(int argc, const char **argv) /* figure out what place to connect to as a client/server. */ /* XXXX when we add socks support, clients will not have a fixed "target" * XXXX address but will instead connect to a client-selected address. */ - if (resolve_address_port(argv[4], 1, 0, &ss_target, &sl_target, NULL) < 0) - usage(); - sa_target = (struct sockaddr *)&ss_target; + if (mode != LSN_SOCKS_CLIENT) { + if (argc < 5) + usage(); + if (resolve_address_port(argv[4], 1, 0, &ss_target, &sl_target, NULL) < 0) + usage(); + sa_target = (struct sockaddr *)&ss_target; + } /* Let's see if the user wants a shared secret. So ugly. So ugly. So ugly. So ugly. So ugly interface.

1 0

[obfsproxy/master] Fix gcc 4.6.0 compilation warnings
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit 1061249f51056278890e3e566774f2672ef1b031 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 11:56:37 2011 -0400 Fix gcc 4.6.0 compilation warnings --- src/main.c | 6 ++---- src/test/unittest_obfs2.c | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 4c3c48c..8af4934 100644 --- a/src/main.c +++ b/src/main.c @@ -44,7 +44,7 @@ int main(int argc, const char **argv) { int protocol; - int is_client, is_socks = 0, mode; + int is_socks = 0, mode; struct sockaddr_storage ss_listen, ss_target; struct sockaddr *sa_target=NULL; int sl_listen, sl_target=0; @@ -59,16 +59,13 @@ main(int argc, const char **argv) if (argc < 4) usage(); if (!strcmp(argv[1], "client")) { - is_client = 1; defport = "48988"; /* bf5c */ mode = LSN_SIMPLE_CLIENT; } else if (!strcmp(argv[1], "socks")) { - is_client = 1; is_socks = 1; defport = "23548"; /* 5bf5 */ mode = LSN_SOCKS_CLIENT; } else if (!strcmp(argv[1], "server")) { - is_client = 0; defport = "11253"; /* 2bf5 */ mode = LSN_SIMPLE_SERVER; } else { @@ -122,6 +119,7 @@ main(int argc, const char **argv) /* Handle signals */ signal(SIGPIPE, SIG_IGN); sigevent = evsignal_new(base, SIGINT, handle_signal_cb, (void*) base); + event_add(sigevent, NULL); /* start an evconnlistener on the appropriate port(s) */ listener = listener_new(base, diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index b04040d..0de4766 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -207,6 +207,8 @@ test_proto_transfer(void *data) n = evbuffer_peek(dummy_buffer, -1, NULL, &v[1], 2); tt_int_op(0, ==, strncmp(msg2, v[1].iov_base, 55)); + (void) n; /* XXXX: use n for something, or remove it. */ + end: if (client_proto->state) proto_destroy(client_proto);

1 0

[tor/master] Fix compile error in procmon.c
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit 1d8bcba067ef8d96ebe022f06459d55c308343ec Author: Gisle <gvanem(a)broadpark.no> Date: Wed Jun 1 11:11:12 2011 -0400 Fix compile error in procmon.c An elusive compile-error (MingW-gcc v4.50 on Win_XP); a missing comma (!) and a typo ('err_msg' at line 277 changed to 'errmsg'). Aso changed the format for 'err_code' at line 293 into a "%ld" to suppress a warning. How did this go unnoticed for ~1 month? Btw. This is my 1st ever 'git commit', so it better work. --- src/common/procmon.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/procmon.c b/src/common/procmon.c index 8fcc1af..5c10e9a 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -252,7 +252,7 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, if (!GetExitCodeProcess(procmon->hproc, &exit_code)) { char *errmsg = format_win32_error(GetLastError()); log_warn(procmon->log_domain, "Error \"%s\" occurred while polling " - "handle for monitored process %d; assuming it's dead." + "handle for monitored process %d; assuming it's dead.", errmsg, procmon->pid); tor_free(errmsg); its_dead_jim = 1; @@ -287,12 +287,12 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, if (!its_dead_jim) log_info(procmon->log_domain, "Failed to open handle to monitored " - "process %d, and error code %d (%s) is not 'invalid " + "process %d, and error code %lu (%s) is not 'invalid " "parameter' -- assuming the process is still alive.", procmon->pid, - err_code, err_msg); + err_code, errmsg); - tor_free(err_msg); + tor_free(errmsg); } } #else

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit b73a662a2697dcfe0ee06737cedd2130bdd29129 Merge: a610ebc 1d8bcba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 11:11:31 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/procmon.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.2] Fix compile error in procmon.c
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit 1d8bcba067ef8d96ebe022f06459d55c308343ec Author: Gisle <gvanem(a)broadpark.no> Date: Wed Jun 1 11:11:12 2011 -0400 Fix compile error in procmon.c An elusive compile-error (MingW-gcc v4.50 on Win_XP); a missing comma (!) and a typo ('err_msg' at line 277 changed to 'errmsg'). Aso changed the format for 'err_code' at line 293 into a "%ld" to suppress a warning. How did this go unnoticed for ~1 month? Btw. This is my 1st ever 'git commit', so it better work. --- src/common/procmon.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/procmon.c b/src/common/procmon.c index 8fcc1af..5c10e9a 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -252,7 +252,7 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, if (!GetExitCodeProcess(procmon->hproc, &exit_code)) { char *errmsg = format_win32_error(GetLastError()); log_warn(procmon->log_domain, "Error \"%s\" occurred while polling " - "handle for monitored process %d; assuming it's dead." + "handle for monitored process %d; assuming it's dead.", errmsg, procmon->pid); tor_free(errmsg); its_dead_jim = 1; @@ -287,12 +287,12 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, if (!its_dead_jim) log_info(procmon->log_domain, "Failed to open handle to monitored " - "process %d, and error code %d (%s) is not 'invalid " + "process %d, and error code %lu (%s) is not 'invalid " "parameter' -- assuming the process is still alive.", procmon->pid, - err_code, err_msg); + err_code, errmsg); - tor_free(err_msg); + tor_free(errmsg); } } #else

1 0

[tor/master] stop asserting at boot
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit 56771f392e68eb2f78180daab0d8f17c9284ad11 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 30 23:50:37 2011 -0400 stop asserting at boot The patch for 3228 made us try to run init_keys() before we had loaded our state file, resulting in an assert inside init_keys. We had moved it too early in the function. Now it's later in the function, but still above the accounting calls. --- src/or/config.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f97e9b1..6635cac 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1180,18 +1180,6 @@ options_act(or_options_t *old_options) return -1; } - /* We want to reinit keys as needed before we do much of anything else: - keys are important, and other things can depend on them. */ - if (running_tor && - (transition_affects_workers || - (options->V3AuthoritativeDir && (!old_options || - !old_options->V3AuthoritativeDir)))) { - if (init_keys() < 0) { - log_warn(LD_BUG,"Error initializing keys; exiting"); - return -1; - } - } - if (consider_adding_dir_authorities(options, old_options) < 0) return -1; @@ -1237,6 +1225,17 @@ options_act(or_options_t *old_options) finish_daemon(options->DataDirectory); } + /* We want to reinit keys as needed before we do much of anything else: + keys are important, and other things can depend on them. */ + if (transition_affects_workers || + (options->V3AuthoritativeDir && (!old_options || + !old_options->V3AuthoritativeDir))) { + if (init_keys() < 0) { + log_warn(LD_BUG,"Error initializing keys; exiting"); + return -1; + } + } + /* Write our PID to the PID file. If we do not have write permissions we * will log a warning */ if (options->PidFile)

1 0

[tor/master] Report wrong key sizes correctly
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit 0fd3ad75daf925e8192aa1d44b229b3b7c29829d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 11:07:08 2011 -0400 Report wrong key sizes correctly When we introduced NEED_KEY_1024 in routerparse.c back in 0.2.0.1-alpha, I forgot to add a *8 when logging the length of a bad-length key. Bugfix for 3318 on 0.2.0.1-alpha. --- changes/bug3318 | 3 +++ src/or/routerparse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug3318 b/changes/bug3318 new file mode 100644 index 0000000..38991c4 --- /dev/null +++ b/changes/bug3318 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix a log message that said "bits" while displaying a value in + bytes. Fixes bug 3318; bugfix on 0.2.0.1-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 1dcbc6a..3728e99 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3767,7 +3767,7 @@ token_check_object(memarea_t *area, const char *kwd, case NEED_SKEY_1024: /* There must be a 1024-bit private key. */ if (tok->key && crypto_pk_keysize(tok->key) != PK_BYTES) { tor_snprintf(ebuf, sizeof(ebuf), "Wrong size on key for %s: %d bits", - kwd, (int)crypto_pk_keysize(tok->key)); + kwd, (int)crypto_pk_keysize(tok->key)*8); RET_ERR(ebuf); } /* fall through */

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 01 Jun '11

01 Jun '11

commit a610ebc3a6990261f1cd4ac7c498a3fe8a6c1a53 Merge: d0e7c54 0fd3ad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 11:08:28 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3318 | 3 +++ src/or/config.c | 23 +++++++++++------------ src/or/routerparse.c | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-)

1 0