November 2015 - tor-commits - lists.torproject.org

[webwml/staging] Add link to donor page (#17681)
by mikeperry＠torproject.org 30 Nov '15

30 Nov '15

commit cd0da7497adc1f435a0de4c409239c5fbe056ef5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 25 11:04:57 2015 +0100 Add link to donor page (#17681) --- donate/en/donor-faq.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml index 2fff4ab..e9005b4 100644 --- a/donate/en/donor-faq.wml +++ b/donate/en/donor-faq.wml @@ -147,7 +147,7 @@ </li> <li> <p><strong>Can I become a Tor Project member?</strong></p> - <p>Right now, we don't have a membership program, but we may set one up in the future. If you want to get involved with the Tor Project, this is a good place to start.</p> + <p>Right now, we don't have a membership program, but we may set one up in the future. If you want to get involved with the Tor Project, <a href="<page getinvolved/volunteer>">this is a good place to start</a>.</p> </li> <li> <p><strong>How can I get a Tor t-shirt or stickers?</strong></p> @@ -199,4 +199,4 @@ </div> </div> </div> -#include <donatefoot.wmi> \ No newline at end of file +#include <donatefoot.wmi>

1 0

[webwml/staging] Improve the horribly ugly secondary donation options page.
by mikeperry＠torproject.org 30 Nov '15

30 Nov '15

commit 9419a420f3a9f80c5c02a901f8588299b3a2f864 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 30 13:25:45 2015 -0800 Improve the horribly ugly secondary donation options page. This is not a masterpiece, but at least it probably won't provoke as much laughter. --- donate/en/donate-options.wml | 155 ++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 75 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index ba41c37..58a63f7 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -2,85 +2,65 @@ # Revision: $Revision$ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page donate/donate>">Donate</a> - </div> -<div id="maincol"> - <h1>Make A Donation</h1> - <p><strong>Your support is critical to our success.</strong> The - Tor Project is a US 501(c)(3) non-profit dedicated to research, - development, and education about online anonymity and privacy. Donations - to The Tor Project may be tax deductible to persons who are in the - US; or who pay taxes in countries with reciprocity with the US on - charitable donations. Our tax ID number is 20-8096820. We are listed on - <a href="http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx">GuideStar</a>.</p> +#include "donatehead.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" + +<style> +.hlist { + padding: 0px; + text-align: center; + display: block; + width: 100%; + list-style: outside none none; + margin: 0px 0px 18px; +} + +.hlist li { + display: inline-block; + border-right: 1px solid #444; + margin-left: -4px; +} +.hlist a { + display: block; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + text-decoration: none; + font-weight: bold; + padding: 0px 8px; +} - <p>We're happy to have you shop and indirectly support us via -<a href="http://smile.amazon.com/ch/20-8096820">Amazon Smile</a>. A -portion of your purchase is donated to help keep us working.</p> +.hlist li.last { + border-right: 0px solid #444; +} +</style> - We're happy to accept direct donations via:</p> +<div id="content" class="container"> +<div id="maincol"> + <h1>Ways to Donate to Tor</h1> + <p>The Tor Project offers the following donation methods:</p> <ul class="hlist"> - <li><a href="<page donate/donate>">Paypal</a></li> -  - <li><a href="#dwolla">Dwolla</a></li> <li><a href="#bitcoin">Bitcoins</a></li> - <li class="last"><a href="#cash">checks, money orders, or bank transfers</a></li> + <li><a href="<page donate/donate-amazon>">Amazon Payments</a></li> + <li><a href="https://smile.amazon.com/ch/20-8096820">Amazon Smile</a></li> + <li><a href="https://www.dwolla.com/hub/thetorproject">Dwolla</a></li> + <li><a href="<page donate/donate>">Paypal</a></li> + <li class="last"><a href="#cash">Checks or Money Orders</a></li> </ul> - <p>Contact us at donations(a)torproject.org for more donation details.</p> <div class="hundred toptwenty"> - -   - - <a id="dwolla"></a> - <div class="dbox dsmall dwolla"> - <h3>Donate via Dwolla</h3> - <p>Dwolla is a peer to peer payment platform which allows users to -exchange money quickly, safely, at a lower cost.</p> - <p style="text-align:center;"><strong><a -href="https://www.dwolla.com/hub/thetorproject">Continue to Dwolla -»</a></strong></p> - </div> -  <a id="bitcoin"></a> <div class="hundred toptwenty"> <div class="dbox donate"> <h3>Bitcoins</h3> - <p>Please consider a donation to - <a href="https://www.torservers.net/donate.html">Torservers.net</a>, + <p>In order to comply with US 501(c)(3) non-profit regulations, our Bitcoin transaction limit is currently $10,000 USD per day. + If you wish to avoid transaction limits, please consider a direct Bitcoin donation to + <a href="https://www.torservers.net/donate.html#cryptocurrencies">Torservers.net</a>, <a href="http://noisetor.net/#bitcoin">NoiseTor</a>, - or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin">Tails</a> - which will turn your bitcoin donation into a faster, larger Tor - Network for all.</p> - <p>If you are committed to donating bitcoins to Tor, please complete the form below.</p> + <a href="https://www.oniontip.com/">OnionTip</a>, + or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin">Tails</a>.</p> + <p>If this transaction limit is not an issue for you, please complete the form below:</p> <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> <input name="action" type="hidden" value="checkout"> <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> @@ -145,24 +125,49 @@ href="https://www.dwolla.com/hub/thetorproject">Continue to Dwolla </div> </div>  + + <div class="hundred toptwenty"> + <div class="dbox dsmall dwolla"> + <h3>Donate via Amazon</h3> + <p>Amazon Payments allows you to donate to Tor via several different +mechanisms using an Amazon account.</p> + <p style="text-align:center;"><strong><a +href="<page donate/donate-amazon>">Donate via Amazon Payments +»</a></strong></p> + </div> + <div class="dbox dsmall dwolla"> + <h3>Donate via Amazon Smile</h3> + <p>Amazon Smile allows you to donate 0.5% of your Amazon purchases to the Tor Project.</p> + <p style="text-align:center;"><strong><a href="https://smile.amazon.com/ch/20-8096820">Donate with Amazon Smile +»</a></strong></p> + </div> + + + <a id="dwolla"></a> + <div class="dbox dsmall dwolla"> + <h3>Donate via Dwolla</h3> + <p>Dwolla is a peer to peer payment platform which allows users to +exchange money quickly, safely, at a lower cost.</p> + <p style="text-align:center;"><strong><a href="https://www.dwolla.com/hub/thetorproject">Donate via Dwolla +»</a></strong></p> + </div> + + </div> </div>  <a id="cash"></a> <div class="hundred toptwenty"> <div class="dbox donate"> - <h3>Donate via Check, Cash, Money Order, Bank Transfer</h3> + <h3>Donate via Check or Money Order</h3> <h4>You can send checks or money orders to:</h4> <p>The Tor Project, Inc<br> 7 Temple Street, Suite A<br> Cambridge, MA 02139-2403 USA</p>  - -</div> - <div id = "sidecol"> -#include "side-donate.wmi" -#include "info.wmi" - </div> -  + + <p>Contact us at donations(a)torproject.org for more donation details.</p> + </div>  </div> -#include <foot.wmi> +</div> +#include <donatefoot.wmi>

1 0

[tor/master] More fixes/debugging attempts for 17659
by nickm＠torproject.org 27 Nov '15

27 Nov '15

commit 0a701e537778ac9da31049f4efebf7cb2bf9c285 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 27 12:54:57 2015 -0500 More fixes/debugging attempts for 17659 --- src/or/circuituse.c | 1 + src/or/connection.c | 2 ++ src/or/connection_edge.c | 18 +++++++++++++++++- src/or/connection_edge.h | 8 ++++++++ src/or/control.c | 1 + src/or/dnsserv.c | 2 ++ src/or/relay.c | 1 + src/or/rendclient.c | 3 +++ 8 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 5b24425..e742a56 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1986,6 +1986,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, "No intro points for '%s': re-fetching service descriptor.", safe_str_client(rend_data->onion_address)); rend_client_refetch_v2_renddesc(rend_data); + connection_ap_mark_as_non_pending_circuit(conn); ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_RENDDESC_WAIT; return 0; } diff --git a/src/or/connection.c b/src/or/connection.c index 78176d3..b31b99c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1597,6 +1597,8 @@ connection_init_accepted_conn(connection_t *conn, break; case CONN_TYPE_AP_TRANS_LISTENER: TO_ENTRY_CONN(conn)->is_transparent_ap = 1; + /* XXXX028 -- is this correct still, with the addition of + * pending_entry_connections ? */ conn->state = AP_CONN_STATE_CIRCUIT_WAIT; return connection_ap_process_transparent(TO_ENTRY_CONN(conn)); case CONN_TYPE_AP_NATD_LISTENER: diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 078b9e2..30dcd13 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -771,7 +771,7 @@ connection_ap_rescan_and_attach_pending(void) "adding it.", pending_entry_connections); untried_pending_connections = 1; - smartlist_add(pending_entry_connections, entry_conn); + connection_ap_mark_as_pending_circuit(entry_conn); } } SMARTLIST_FOREACH_END(conn); @@ -827,8 +827,11 @@ connection_ap_attach_pending(int retry) conn->type != CONN_TYPE_AP || conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); + continue; } + tor_assert(conn->magic == ENTRY_CONNECTION_MAGIC); + } SMARTLIST_FOREACH_END(entry_conn); untried_pending_connections = 0; @@ -847,6 +850,7 @@ connection_ap_mark_as_pending_circuit_(entry_connection_t *entry_conn, { connection_t *conn = ENTRY_TO_CONN(entry_conn); tor_assert(conn->state == AP_CONN_STATE_CIRCUIT_WAIT); + tor_assert(conn->magic == ENTRY_CONNECTION_MAGIC); if (conn->marked_for_close) return; @@ -866,6 +870,15 @@ connection_ap_mark_as_pending_circuit_(entry_connection_t *entry_conn, smartlist_add(pending_entry_connections, entry_conn); } +/** Mark <b>entry_conn</b> as no longer waiting for a circuit. */ +void +connection_ap_mark_as_non_pending_circuit(entry_connection_t *entry_conn) +{ + if (PREDICT_UNLIKELY(NULL == pending_entry_connections)) + return; + smartlist_remove(pending_entry_connections, entry_conn); +} + /** Tell any AP streams that are waiting for a one-hop tunnel to * <b>failed_digest</b> that they are going to fail. */ /* XXX024 We should get rid of this function, and instead attach @@ -986,6 +999,7 @@ connection_ap_detach_retriable(entry_connection_t *conn, circuit_detach_stream(TO_CIRCUIT(circ),ENTRY_TO_EDGE_CONN(conn)); connection_ap_mark_as_pending_circuit(conn); } else { + CONNECTION_AP_EXPECT_NONPENDING(conn); ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; circuit_detach_stream(TO_CIRCUIT(circ),ENTRY_TO_EDGE_CONN(conn)); } @@ -1038,6 +1052,7 @@ connection_ap_rewrite_and_attach_if_allowed(entry_connection_t *conn, const or_options_t *options = get_options(); if (options->LeaveStreamsUnattached) { + CONNECTION_AP_EXPECT_NONPENDING(conn); ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; return 0; } @@ -1689,6 +1704,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, * Also, a fetch could have been requested if the onion address was not * found in the cache previously. */ if (refetch_desc || !rend_client_any_intro_points_usable(entry)) { + connection_ap_mark_as_non_pending_circuit(conn); base_conn->state = AP_CONN_STATE_RENDDESC_WAIT; log_info(LD_REND, "Unknown descriptor %s. Fetching.", safe_str_client(rend_data->onion_address)); diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 90cf2a3..6da51eb 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -70,6 +70,14 @@ void connection_ap_mark_as_pending_circuit_(entry_connection_t *entry_conn, const char *file, int line); #define connection_ap_mark_as_pending_circuit(c) \ connection_ap_mark_as_pending_circuit_((c), __FILE__, __LINE__) +void connection_ap_mark_as_non_pending_circuit(entry_connection_t *entry_conn); +#define CONNECTION_AP_EXPECT_NONPENDING(c) do { \ + if (ENTRY_TO_CONN(c)->state == AP_CONN_STATE_CIRCUIT_WAIT) { \ + log_warn(LD_BUG, "At %s:%d: %p was unexpectedly in circuit_wait.", \ + __FILE__, __LINE__, (c)); \ + connection_ap_mark_as_non_pending_circuit(c); \ + } \ + } while (0) void connection_ap_fail_onehop(const char *failed_digest, cpath_build_state_t *build_state); void circuit_discard_optional_exit_enclaves(extend_info_t *info); diff --git a/src/or/control.c b/src/or/control.c index f2eab7b..34d03be 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3011,6 +3011,7 @@ handle_control_attachstream(control_connection_t *conn, uint32_t len, edge_conn->end_reason = 0; if (tmpcirc) circuit_detach_stream(tmpcirc, edge_conn); + CONNECTION_AP_EXPECT_NONPENDING(ap_conn); TO_CONN(edge_conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; } diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index f771090..ded0d84 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -125,6 +125,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) /* Make a new dummy AP connection, and attach the request to it. */ entry_conn = entry_connection_new(CONN_TYPE_AP, AF_INET); conn = ENTRY_TO_EDGE_CONN(entry_conn); + CONNECTION_AP_EXPECT_NONPENDING(entry_conn); TO_CONN(conn)->state = AP_CONN_STATE_RESOLVE_WAIT; conn->is_dns_request = 1; @@ -199,6 +200,7 @@ dnsserv_launch_request(const char *name, int reverse, /* Make a new dummy AP connection, and attach the request to it. */ entry_conn = entry_connection_new(CONN_TYPE_AP, AF_INET); conn = ENTRY_TO_EDGE_CONN(entry_conn); + CONNECTION_AP_EXPECT_NONPENDING(entry_conn); conn->base_.state = AP_CONN_STATE_RESOLVE_WAIT; tor_addr_copy(&TO_CONN(conn)->addr, &control_conn->base_.addr); diff --git a/src/or/relay.c b/src/or/relay.c index eddad6a..aed6bf7 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1304,6 +1304,7 @@ connection_edge_process_relay_cell_not_open( "Got 'connected' while not in state connect_wait. Dropping."); return 0; } + CONNECTION_AP_EXPECT_NONPENDING(entry_conn); conn->base_.state = AP_CONN_STATE_OPEN; log_info(LD_APP,"'connected' received for circid %u streamid %d " "after %d seconds.", diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 3e1c4f3..d9cea53 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -173,6 +173,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, while ((conn = connection_get_by_type_state_rendquery(CONN_TYPE_AP, AP_CONN_STATE_CIRCUIT_WAIT, introcirc->rend_data->onion_address))) { + connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn)); conn->state = AP_CONN_STATE_RENDDESC_WAIT; } } @@ -1055,9 +1056,11 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro, rend_client_refetch_v2_renddesc(rend_query); /* move all pending streams back to renddesc_wait */ + /* NOTE: We can now do this faster, if we use pending_entry_connections */ while ((conn = connection_get_by_type_state_rendquery(CONN_TYPE_AP, AP_CONN_STATE_CIRCUIT_WAIT, rend_query->onion_address))) { + connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn)); conn->state = AP_CONN_STATE_RENDDESC_WAIT; }

1 0

[tor/master] Fix use-after-free of stack memory in getinfo_helper_policies
by nickm＠torproject.org 27 Nov '15

27 Nov '15

commit 3f83ea84c73e5066eaac87080322f13fc0c7ab91 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Nov 27 09:31:47 2015 +1100 Fix use-after-free of stack memory in getinfo_helper_policies --- src/or/policies.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index a46eb96..126ba46 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -2165,11 +2165,11 @@ getinfo_helper_policies(control_connection_t *conn, smartlist_t *private_policy_list = smartlist_new(); smartlist_t *configured_addresses = smartlist_new(); - /* Add the configured addresses to the tor_addr_t* list */ - policies_add_ipv4h_to_smartlist(configured_addresses, me->addr); - policies_add_addr_to_smartlist(configured_addresses, &me->ipv6_addr); - policies_add_outbound_addresses_to_smartlist(configured_addresses, - options); + /* Copy the configured addresses into the tor_addr_t* list */ + policies_copy_ipv4h_to_smartlist(configured_addresses, me->addr); + policies_copy_addr_to_smartlist(configured_addresses, &me->ipv6_addr); + policies_copy_outbound_addresses_to_smartlist(configured_addresses, + options); policies_parse_exit_policy_reject_private( &private_policy_list, @@ -2179,7 +2179,7 @@ getinfo_helper_policies(control_connection_t *conn, *answer = policy_dump_to_string(private_policy_list, 1, 1); addr_policy_list_free(private_policy_list); - /* the addresses in configured_addresses are not ours to free */ + SMARTLIST_FOREACH(configured_addresses, tor_addr_t *, a, tor_free(a)); smartlist_free(configured_addresses); } else if (!strcmpstart(question, "exit-policy/")) { const routerinfo_t *me = router_get_my_routerinfo();

1 0

[tor/master] Fix memory leak in policies test
by nickm＠torproject.org 27 Nov '15

27 Nov '15

commit 8ce70fcbf35630889e6acc64388476ea0c859a1e Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Nov 26 19:03:44 2015 +0100 Fix memory leak in policies test --- src/test/test_policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 082f930..b7d89a1 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -1033,7 +1033,7 @@ test_policies_getinfo_helper_policies(void *arg) tor_free(answer); UNMOCK(get_options); UNMOCK(router_get_my_routerinfo); - smartlist_free(mock_my_routerinfo.exit_policy); + addr_policy_list_free(mock_my_routerinfo.exit_policy); } #undef DEFAULT_POLICY_STRING

1 0

[tor/master] Merge branch 'fix-policies-memory-v2-squashed'
by nickm＠torproject.org 27 Nov '15

27 Nov '15

commit 85a48d5e471c62003d58e615bac8e1bd8c09631a Merge: eedef41 8ce70fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 27 11:54:52 2015 -0500 Merge branch 'fix-policies-memory-v2-squashed' src/or/policies.c | 71 ++++++++++++++++++++++++++++-------------------- src/test/test_policy.c | 2 +- 2 files changed, 42 insertions(+), 31 deletions(-)

1 0

[tor/master] Fix use-after-free of stack memory in policies_parse_exit_policy*
by nickm＠torproject.org 27 Nov '15

27 Nov '15

commit 7a6ed3e65ef6e5f5968ffff59e1a00a0334a886f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Nov 27 09:17:44 2015 +1100 Fix use-after-free of stack memory in policies_parse_exit_policy* Change the function names & comments to make the copying explicit. --- src/or/policies.c | 59 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index d531b3a..a46eb96 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1270,41 +1270,53 @@ policies_parse_exit_policy(config_line_t *cfg, smartlist_t **dest, add_default); } -/** Helper function that adds addr to a smartlist as long as it is non-NULL - * and not tor_addr_is_null(). */ +/** Helper function that adds a copy of addr to a smartlist as long as it is + * non-NULL and not tor_addr_is_null(). + * + * The caller is responsible for freeing all the tor_addr_t* in the smartlist. + */ static void -policies_add_addr_to_smartlist(smartlist_t *addr_list, const tor_addr_t *addr) +policies_copy_addr_to_smartlist(smartlist_t *addr_list, const tor_addr_t *addr) { if (addr && !tor_addr_is_null(addr)) { - smartlist_add(addr_list, (void *)addr); + tor_addr_t *addr_copy = tor_malloc(sizeof(tor_addr_t)); + tor_addr_copy(addr_copy, addr); + smartlist_add(addr_list, addr_copy); } } /** Helper function that adds ipv4h_addr to a smartlist as a tor_addr_t *, - * by converting it to a tor_addr_t and passing it to - * policies_add_addr_to_smartlist. */ + * as long as it is not tor_addr_is_null(), by converting it to a tor_addr_t + * and passing it to policies_add_addr_to_smartlist. + * + * The caller is responsible for freeing all the tor_addr_t* in the smartlist. + */ static void -policies_add_ipv4h_to_smartlist(smartlist_t *addr_list, uint32_t ipv4h_addr) +policies_copy_ipv4h_to_smartlist(smartlist_t *addr_list, uint32_t ipv4h_addr) { if (ipv4h_addr) { tor_addr_t ipv4_tor_addr; tor_addr_from_ipv4h(&ipv4_tor_addr, ipv4h_addr); - policies_add_addr_to_smartlist(addr_list, (void *)&ipv4_tor_addr); + policies_copy_addr_to_smartlist(addr_list, &ipv4_tor_addr); } } -/** Helper function that adds or_options->OutboundBindAddressIPv[4|6]_ to a - * smartlist as a tor_addr_t *, as long as or_options is non-NULL, - * by passing them to policies_add_addr_to_smartlist. */ +/** Helper function that adds copies of + * or_options->OutboundBindAddressIPv[4|6]_ to a smartlist as tor_addr_t *, as + * long as or_options is non-NULL, and the addresses are not + * tor_addr_is_null(), by passing them to policies_add_addr_to_smartlist. + * + * The caller is responsible for freeing all the tor_addr_t* in the smartlist. + */ static void -policies_add_outbound_addresses_to_smartlist(smartlist_t *addr_list, - const or_options_t *or_options) +policies_copy_outbound_addresses_to_smartlist(smartlist_t *addr_list, + const or_options_t *or_options) { if (or_options) { - policies_add_addr_to_smartlist(addr_list, - &or_options->OutboundBindAddressIPv4_); - policies_add_addr_to_smartlist(addr_list, - &or_options->OutboundBindAddressIPv6_); + policies_copy_addr_to_smartlist(addr_list, + &or_options->OutboundBindAddressIPv4_); + policies_copy_addr_to_smartlist(addr_list, + &or_options->OutboundBindAddressIPv6_); } } @@ -1361,17 +1373,16 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, parser_cfg |= EXIT_POLICY_ADD_DEFAULT; } - /* Add the configured addresses to the tor_addr_t* list */ - policies_add_ipv4h_to_smartlist(configured_addresses, local_address); - policies_add_addr_to_smartlist(configured_addresses, ipv6_local_address); - policies_add_outbound_addresses_to_smartlist(configured_addresses, - or_options); + /* Copy the configured addresses into the tor_addr_t* list */ + policies_copy_ipv4h_to_smartlist(configured_addresses, local_address); + policies_copy_addr_to_smartlist(configured_addresses, ipv6_local_address); + policies_copy_outbound_addresses_to_smartlist(configured_addresses, + or_options); rv = policies_parse_exit_policy(or_options->ExitPolicy, result, parser_cfg, configured_addresses); - /* We don't need to free the pointers in this list, they are either constant - * or locally scoped. */ + SMARTLIST_FOREACH(configured_addresses, tor_addr_t *, a, tor_free(a)); smartlist_free(configured_addresses); return rv;

1 0

[tor/master] Add a stack trace for help debugging one part of 17659
by nickm＠torproject.org 27 Nov '15

27 Nov '15

commit a33e9f208ae088fa3d63147fad9fc23654ca7ae1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 27 12:11:51 2015 -0500 Add a stack trace for help debugging one part of 17659 --- src/or/connection_edge.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 8b2f635..078b9e2 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -11,6 +11,9 @@ #define CONNECTION_EDGE_PRIVATE #include "or.h" + +#include "backtrace.h" + #include "addressmap.h" #include "buffers.h" #include "channel.h" @@ -855,6 +858,7 @@ connection_ap_mark_as_pending_circuit_(entry_connection_t *entry_conn, log_warn(LD_BUG, "What?? pending_entry_connections already contains %p! " "(called from %s:%d)", entry_conn, fname, lineno); + log_backtrace(LOG_WARN, LD_BUG, "To debug, this may help."); return; }

1 0

[tor/master] Use uint16_t, not in_port_t (which does not exist on Windows). See #17638.
by nickm＠torproject.org 27 Nov '15

27 Nov '15

commit a45aacd2e292ea0522313e430e5ff8c70fadf8f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 27 11:39:03 2015 -0500 Use uint16_t, not in_port_t (which does not exist on Windows). See #17638. --- src/common/compat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index bd59e0f..9e76592 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1509,9 +1509,9 @@ tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) tor_socket_t acceptor = TOR_INVALID_SOCKET; tor_addr_t listen_tor_addr; struct sockaddr listen_addr; - in_port_t listen_port = 0; + uint16_t listen_port = 0; tor_addr_t connect_tor_addr; - in_port_t connect_port = 0; + uint16_t connect_port = 0; struct sockaddr connect_addr; socklen_t size; int saved_errno = -1;

1 0

[tor/master] Make SIZEOF_SOCKADDR return socklen_t to avoid bad compares.
by nickm＠torproject.org 27 Nov '15

27 Nov '15

commit f108be7c2556de20dc34c0a8ad52b19c363febbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 27 11:48:54 2015 -0500 Make SIZEOF_SOCKADDR return socklen_t to avoid bad compares. --- src/common/compat.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 9e76592..0b4e4a4 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1487,10 +1487,18 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) #ifdef NEED_ERSATZ_SOCKETPAIR -#define SIZEOF_SOCKADDR(domain) \ - (domain == AF_INET ? sizeof(struct sockaddr_in) : \ - (domain == AF_INET6 ? sizeof(struct sockaddr_in6) : \ - ((size_t)0) /* unsupported, don't match any valid size */)) +static INLINE socklen_t +SIZEOF_SOCKADDR(int domain) +{ + switch (domain) { + case AF_INET: + return sizeof(struct sockaddr_in); + case AF_INET6: + return sizeof(struct sockaddr_in6); + default: + return 0; + } +} /** * Helper used to implement socketpair on systems that lack it, by

1 0