May 2012 - tor-commits - lists.torproject.org

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

31 May '12

commit dff73d26f3a6c9d7011ad98a6752129a37625a10 Merge: fc08422 b86c562 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 16:21:54 2012 -0400 Merge remote-tracking branch 'public/bug5089' Conflicts: src/test/test_util.c Merge the unit tests; I added some when I did this branch against 0.2.2, and then the test format changed and master added more tests. changes/bug5089 | 5 +++++ src/common/compat.c | 13 +++++++++++-- src/test/test_util.c | 16 ++++++---------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --cc src/common/compat.c index 59c7ca4,ffd9724..0931061 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -1678,9 -1507,9 +1682,9 @@@ get_parent_directory(char *fname */ cp = fname + strlen(fname); at_end = 1; - while (--cp > fname) { + while (--cp >= fname) { int is_sep = (*cp == '/' -#ifdef MS_WINDOWS +#ifdef _WIN32 || *cp == '\\' #endif ); diff --cc src/test/test_util.c index 99c5544,a393079..e052692 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -2080,35 -1297,17 +2080,31 @@@ test_util_parent_dir(void *ptr tor_free(cp); \ } while (0); - T("/home/wombat/knish", 0, "/home/wombat"); - T("/home/wombat/knish/", 0, "/home/wombat"); - T("/home", 0, "/"); - T("./home/wombat/knish/", 0, "./home/wombat"); - T("./wombat", 0, "."); + T("/home/wombat", 0, "/home/wombat/knish"); + T("/home/wombat", 0, "/home/wombat/knish/"); + T("/home/wombat", 0, "/home/wombat/knish///"); + T("./home/wombat", 0, "./home/wombat/knish/"); - #if 0 + T("/", 0, "/home"); + T("/", 0, "/home//"); - #endif + T(".", 0, "./wombat"); + T(".", 0, "./wombat/"); + T(".", 0, "./wombat//"); + T("wombat", 0, "wombat/foo"); + T("wombat/..", 0, "wombat/../foo"); + T("wombat/../", 0, "wombat/..//foo"); /* Is this correct? */ + T("wombat/.", 0, "wombat/./foo"); + T("wombat/./", 0, "wombat/.//foo"); /* Is this correct? */ + T("wombat", 0, "wombat/..//"); + T("wombat", 0, "wombat/foo/"); + T("wombat", 0, "wombat/.foo"); + T("wombat", 0, "wombat/.foo/"); + - T("", -1, ""); - T("", -1, "."); - T("", -1, ".."); - T("", -1, "../"); - T("", -1, "/"); - T("", -1, "////"); - T("", -1, "wombat"); - T("", -1, "wombat/"); + T("wombat", -1, ""); + T("w", -1, ""); - T("wombat/knish", 0, "wombat"); - T("", -1, ""); ++ T("wombat", 0, "wombat/knish"); ++ + T("/", 0, "/"); - T("////", 0, "/"); ++ T("/", 0, "////"); done: tor_free(cp);

1 0

[tor/master] Delay getsockname() call until after connect() is done
by nickm＠torproject.org 31 May '12

31 May '12

commit 9d41629aa072b389332273a21926260c302b49e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 24 16:57:36 2012 -0400 Delay getsockname() call until after connect() is done On Windows, getsockname() on a nonblocking apparently won't work until the connection is done connecting. On XP, it seems to fail by reporting success and declaring that your address is INADDR_ANY. On the Win8 preview, though, it fails more loudly and says WSAEINVAL. Fix for bug 5374; bugfix on 0.1.1.14-alpha. --- changes/bug5374 | 7 +++++++ src/or/connection.c | 11 ++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/changes/bug5374 b/changes/bug5374 new file mode 100644 index 0000000..926a074 --- /dev/null +++ b/changes/bug5374 @@ -0,0 +1,7 @@ + o Minor bugfixes: + + - Don't check for whether the address we're using for outbound + connections has changed until after the outbound connection has + completed. On Windows, getsockname() doesn't succeed until the + connection is finished. Fix for bug 5374; bugfix on + 0.1.1.14-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index dc75601..96f8d45 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1393,9 +1393,6 @@ connection_connect(connection_t *conn, const char *address, } } - if (!server_mode(options)) - client_check_address_changed(s); - /* it succeeded. we're connected. */ log_fn(inprogress?LOG_DEBUG:LOG_INFO, LD_NET, "Connection to %s:%u %s (sock %d).", @@ -3434,6 +3431,14 @@ static int connection_finished_connecting(connection_t *conn) { tor_assert(conn); + + if (!server_mode(get_options())) { + /* See whether getsockname() says our address changed. We need to do this + * now that the connection has finished, because getsockname() on Windows + * won't work until then. */ + client_check_address_changed(conn->s); + } + switch (conn->type) { case CONN_TYPE_OR:

1 0

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

31 May '12

commit fc0842275de8f8ab43374df922907d97b4e60b58 Merge: d1bbd84 9d41629 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 15:07:19 2012 -0400 Merge remote-tracking branch 'public/bug5374' changes/bug5374 | 7 +++++++ src/or/connection.c | 11 ++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-)

1 0

[metrics-web/master] Exit lists now contain @type annotations.
by karsten＠torproject.org 31 May '12

31 May '12

commit 883b369609fc46f1be27548a18d0e2cde13dd943 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 31 21:11:56 2012 +0200 Exit lists now contain @type annotations. --- web/WEB-INF/formats.jsp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 5fbffab..1392a2b 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -87,7 +87,7 @@ are recent: <li><tt>@type torperf 1.0</tt></li> <li><tt>@type bridge-pool-assignment 1.0</tt></li> <li><tt>@type gettor 1.0</tt></li> -<li><tt><font color="gray">@type tordnsel 1.0</font></tt></li> +<li><tt>@type tordnsel 1.0</tt></li> </ul> <hr>

1 0

[tor/master] Remove spurioius return in one out of four if-else clauses.
by nickm＠torproject.org 31 May '12

31 May '12

commit c074562a17b54c5275f99465bc8e2f63c749cb4f Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu May 31 13:05:24 2012 +0200 Remove spurioius return in one out of four if-else clauses. We do return right after the if-else. This return (with its confusing comments) comes from before 6b7c3b42 but doesn't make sense now. --- src/or/connection_or.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index f206089..67d66fc 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1296,8 +1296,6 @@ connection_or_handle_event_cb(struct bufferevent *bufev, short event, connection_or_tls_renegotiated_cb, conn); conn->_base.state = OR_CONN_STATE_TLS_SERVER_RENEGOTIATING; - /* return 0; */ - return; /* ???? */ } else if (handshakes == 2) { /* v2 handshake, as a server. Two handshakes happened already, * so we treat renegotiation as done.

1 0

[tor/master] Remove unexpected "unexpectedly".
by nickm＠torproject.org 31 May '12

31 May '12

commit 0ed963e72ac381edf5e6ad5d084b508aa8d21d15 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu May 31 13:08:57 2012 +0200 Remove unexpected "unexpectedly". --- src/or/connection_or.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 67d66fc..8f88292 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1306,8 +1306,8 @@ connection_or_handle_event_cb(struct bufferevent *bufev, short event, "Closing."); connection_mark_for_close(TO_CONN(conn)); } else { - log_warn(LD_BUG, "We were unexpectedly unexpectedly told that " - "a connection got %d handshakes. Closing.", handshakes); + log_warn(LD_BUG, "We were unexpectedly told that a connection " + "got %d handshakes. Closing.", handshakes); connection_mark_for_close(TO_CONN(conn)); } return;

1 0

[tor/master] Change an assertion into a warning in connection_or_handle_event_cb()
by nickm＠torproject.org 31 May '12

31 May '12

commit 6b7c3b42ee72cb2e7de443e8942ccc21a6304c59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 24 11:14:28 2012 -0400 Change an assertion into a warning in connection_or_handle_event_cb() Possibly addresses bug 4873, though IMO that's likely not a real bug: it seems likely to have been an ssl version mismatch. --- changes/bug4873 | 3 +++ src/or/connection_or.c | 28 ++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/changes/bug4873 b/changes/bug4873 new file mode 100644 index 0000000..6c999cc --- /dev/null +++ b/changes/bug4873 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Turn an assertion (that the number of handshakes received as a + server is not < 1) into a warning. Bug 4873. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 81df70e..f206089 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1286,27 +1286,31 @@ connection_or_handle_event_cb(struct bufferevent *bufev, short event, return; /* ???? */ } } - } else if (tor_tls_get_num_server_handshakes(conn->tls) == 1) { - /* v2 or v3 handshake, as a server. Only got one handshake, so - * wait for the next one. */ - tor_tls_set_renegotiate_callback(conn->tls, - connection_or_tls_renegotiated_cb, - conn); - conn->_base.state = OR_CONN_STATE_TLS_SERVER_RENEGOTIATING; - /* return 0; */ - return; /* ???? */ } else { const int handshakes = tor_tls_get_num_server_handshakes(conn->tls); - tor_assert(handshakes >= 2); - if (handshakes == 2) { + + if (handshakes == 1) { + /* v2 or v3 handshake, as a server. Only got one handshake, so + * wait for the next one. */ + tor_tls_set_renegotiate_callback(conn->tls, + connection_or_tls_renegotiated_cb, + conn); + conn->_base.state = OR_CONN_STATE_TLS_SERVER_RENEGOTIATING; + /* return 0; */ + return; /* ???? */ + } else if (handshakes == 2) { /* v2 handshake, as a server. Two handshakes happened already, * so we treat renegotiation as done. */ connection_or_tls_renegotiated_cb(conn->tls, conn); - } else { + } else if (handshakes > 2) { log_warn(LD_OR, "More than two handshakes done on connection. " "Closing."); connection_mark_for_close(TO_CONN(conn)); + } else { + log_warn(LD_BUG, "We were unexpectedly unexpectedly told that " + "a connection got %d handshakes. Closing.", handshakes); + connection_mark_for_close(TO_CONN(conn)); } return; }

1 0

[tor/master] Merge remote-tracking branch 'linus/bug4873_ln'
by nickm＠torproject.org 31 May '12

31 May '12

commit d1bbd84a6d1f5e721badb55755e278f2e4f0bf7b Merge: fc5d960 0ed963e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 14:37:29 2012 -0400 Merge remote-tracking branch 'linus/bug4873_ln' changes/bug4873 | 3 +++ src/or/connection_or.c | 26 ++++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-)

1 0

[torspec/master] Fix typo in "or-address" syntax (prop 186).
by nickm＠torproject.org 31 May '12

31 May '12

commit d23b90ecb235004501dab4406622ff26e6b9339b Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu May 31 18:51:49 2012 +0200 Fix typo in "or-address" syntax (prop 186). --- proposals/186-multiple-orports.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/proposals/186-multiple-orports.txt b/proposals/186-multiple-orports.txt index a5361a7..20638a5 100644 --- a/proposals/186-multiple-orports.txt +++ b/proposals/186-multiple-orports.txt @@ -115,7 +115,7 @@ New descriptor syntax: or-address SP ADDRESS ":" PORTLIST NL - ADDRESS = IP6ADDR | IP4ADDR + ADDRESS = IPV6ADDR | IPV4ADDR IPV6ADDR = an ipv6 address, surrounded by square brackets. IPV4ADDR = an ipv4 address, represented as a dotted quad. PORTLIST = PORTSPEC | PORTSPEC "," PORTLIST

1 0

[torspec/master] Merge remote-tracking branch 'linus/prop186-typos'
by nickm＠torproject.org 31 May '12

31 May '12

commit 0cc18bd0b5f7285f810206bd3ce28a856205e275 Merge: d7fe6a2 d23b90e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 13:45:21 2012 -0400 Merge remote-tracking branch 'linus/prop186-typos' proposals/186-multiple-orports.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0