March 2011 - tor-commits - lists.torproject.org

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

16 Mar '11

commit c42bd529dea474db1a1af4432b9fe5552c0ca07e Merge: 84f27eb 5938804 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 15:14:28 2011 -0400 Merge remote branch 'origin/maint-0.2.2' src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix a compile warning when using clang
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 30b3f0cdb148f85330e2c93ebb1c00f3cfc8655a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Mar 9 16:39:04 2011 +0100 Fix a compile warning when using clang Issue noticed by Steven Murdoch; fixes bug 2689. The cast didn't do anything, and we don't need to look at the return value of the function here. --- src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index af91099..51306b3 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -412,7 +412,7 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) tor_assert(rend_query); /* Determine responsible dirs. Even if we can't get all we want, * work with the ones we have. If it's empty, we'll notice below. */ - (int) hid_serv_get_responsible_directories(responsible_dirs, desc_id); + hid_serv_get_responsible_directories(responsible_dirs, desc_id); base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_id, DIGEST_LEN);

1 0

[tor/maint-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 5938804d17f6b458fcec9d479cd734d2e0256631 Merge: 98abe14 30b3f0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 15:14:12 2011 -0400 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Fix a compile warning when using clang
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 30b3f0cdb148f85330e2c93ebb1c00f3cfc8655a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Mar 9 16:39:04 2011 +0100 Fix a compile warning when using clang Issue noticed by Steven Murdoch; fixes bug 2689. The cast didn't do anything, and we don't need to look at the return value of the function here. --- src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index af91099..51306b3 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -412,7 +412,7 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) tor_assert(rend_query); /* Determine responsible dirs. Even if we can't get all we want, * work with the ones we have. If it's empty, we'll notice below. */ - (int) hid_serv_get_responsible_directories(responsible_dirs, desc_id); + hid_serv_get_responsible_directories(responsible_dirs, desc_id); base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_id, DIGEST_LEN);

1 0

[tor/maint-0.2.1] Fix a compile warning when using clang
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 30b3f0cdb148f85330e2c93ebb1c00f3cfc8655a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Mar 9 16:39:04 2011 +0100 Fix a compile warning when using clang Issue noticed by Steven Murdoch; fixes bug 2689. The cast didn't do anything, and we don't need to look at the return value of the function here. --- src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index af91099..51306b3 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -412,7 +412,7 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) tor_assert(rend_query); /* Determine responsible dirs. Even if we can't get all we want, * work with the ones we have. If it's empty, we'll notice below. */ - (int) hid_serv_get_responsible_directories(responsible_dirs, desc_id); + hid_serv_get_responsible_directories(responsible_dirs, desc_id); base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_id, DIGEST_LEN);

1 0

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

16 Mar '11

commit 84f27eb051e0a770b16babd3c12198e16bd8537e Merge: f038b45 98abe14 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 14:50:42 2011 -0400 Merge remote branch 'origin/maint-0.2.2' changes/bug2683a | 3 +++ changes/log-typo-2011-03-15-01 | 3 +++ src/or/directory.c | 2 ++ src/or/routerparse.c | 2 +- 4 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix a log message typo
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 98abe1420d21cf67931229fb776117927c7ab1d6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Mar 15 09:48:26 2011 -0700 Fix a log message typo --- changes/log-typo-2011-03-15-01 | 3 +++ src/or/routerparse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/log-typo-2011-03-15-01 b/changes/log-typo-2011-03-15-01 new file mode 100644 index 0000000..3830df3 --- /dev/null +++ b/changes/log-typo-2011-03-15-01 @@ -0,0 +1,3 @@ + o Minor bugfixes + - Fix a minor typo in a log message. Bugfix on 0.2.2.6-alpha. + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 28ce97e..e0605dc 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2822,7 +2822,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, ns->flavor = flav = flavor; } if (flav != FLAV_NS && ns_type != NS_TYPE_CONSENSUS) { - log_warn(LD_DIR, "Flavor found on non-consenus networkstatus."); + log_warn(LD_DIR, "Flavor found on non-consensus networkstatus."); goto err; }

1 0

[tor/master] Log the source of a rejected POSTed v3 vote
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 3af59dcaee4e5ef147dc263dc9f5bf0e5cc72aad Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Mar 15 09:13:25 2011 -0700 Log the source of a rejected POSTed v3 vote Related to ticket 2683. --- changes/bug2683a | 3 +++ src/or/directory.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug2683a b/changes/bug2683a new file mode 100644 index 0000000..2fe308b --- /dev/null +++ b/changes/bug2683a @@ -0,0 +1,3 @@ + o Minor features + - Log the source of a rejected POSTed v3 networkstatus vote. + diff --git a/src/or/directory.c b/src/or/directory.c index f8d587f..00de1f2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3259,6 +3259,8 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, write_http_status_line(conn, status, "Vote stored"); } else { tor_assert(msg); + log_warn(LD_DIRSERV, "Rejected vote from %s (\"%s\").", + conn->_base.address, msg); write_http_status_line(conn, status, msg); } goto done;

1 0

[tor/maint-0.2.2] Fix a log message typo
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 98abe1420d21cf67931229fb776117927c7ab1d6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Mar 15 09:48:26 2011 -0700 Fix a log message typo --- changes/log-typo-2011-03-15-01 | 3 +++ src/or/routerparse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/log-typo-2011-03-15-01 b/changes/log-typo-2011-03-15-01 new file mode 100644 index 0000000..3830df3 --- /dev/null +++ b/changes/log-typo-2011-03-15-01 @@ -0,0 +1,3 @@ + o Minor bugfixes + - Fix a minor typo in a log message. Bugfix on 0.2.2.6-alpha. + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 28ce97e..e0605dc 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2822,7 +2822,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, ns->flavor = flav = flavor; } if (flav != FLAV_NS && ns_type != NS_TYPE_CONSENSUS) { - log_warn(LD_DIR, "Flavor found on non-consenus networkstatus."); + log_warn(LD_DIR, "Flavor found on non-consensus networkstatus."); goto err; }

1 0

[tor/maint-0.2.2] Log the source of a rejected POSTed v3 vote
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 3af59dcaee4e5ef147dc263dc9f5bf0e5cc72aad Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Mar 15 09:13:25 2011 -0700 Log the source of a rejected POSTed v3 vote Related to ticket 2683. --- changes/bug2683a | 3 +++ src/or/directory.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug2683a b/changes/bug2683a new file mode 100644 index 0000000..2fe308b --- /dev/null +++ b/changes/bug2683a @@ -0,0 +1,3 @@ + o Minor features + - Log the source of a rejected POSTed v3 networkstatus vote. + diff --git a/src/or/directory.c b/src/or/directory.c index f8d587f..00de1f2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3259,6 +3259,8 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, write_http_status_line(conn, status, "Vote stored"); } else { tor_assert(msg); + log_warn(LD_DIRSERV, "Rejected vote from %s (\"%s\").", + conn->_base.address, msg); write_http_status_line(conn, status, msg); } goto done;

1 0