tor-commits June 2012

tor-commits@lists.torproject.org

17 participants
880 discussions

[tor/master] conn_type_to_string() on a listener already says it's a listener
by arma＠torproject.org 16 Jun '12

16 Jun '12

commit 26855fe22cc314d0f60162f6e6020aa0741a67e3 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 16 02:29:03 2012 -0400 conn_type_to_string() on a listener already says it's a listener --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 598051e..d90e0fc 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1266,7 +1266,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) SMARTLIST_FOREACH(new_listeners, connection_t *, conn, { - log_notice(LD_NET, "Closing partially-constructed listener %s on %s:%d", + log_notice(LD_NET, "Closing partially-constructed %s on %s:%d", conn_type_to_string(conn->type), conn->address, conn->port); connection_close_immediate(conn); connection_mark_for_close(conn);

1 0

[metrics-tasks/master] Use correct date ranges in censorship reports.
by karsten＠torproject.org 16 Jun '12

16 Jun '12

commit ba28388d79129a6360ff309e83153dd3b4382695 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jun 15 19:54:14 2012 +0300 Use correct date ranges in censorship reports. --- task-2718/detector.py | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/task-2718/detector.py b/task-2718/detector.py index 5cc8bb7..7f924db 100644 --- a/task-2718/detector.py +++ b/task-2718/detector.py @@ -301,6 +301,16 @@ def plot_target(tss, TARGET, xtitle, minx, maxx, DAYS=365, INTERV = 7): c = n_day_rel(ctarget, INTERV) absolute_plot(ctarget[-DAYS:], minx[-DAYS:], maxx[-DAYS:], tss.all_dates[-DAYS:],INTERV, xtitle = xtitle) +def write_censorship_report_prologue(report_file, dates, notification_period): + if (notification_period == 1): + date_str = "%s" % (dates[-1]) # no need for date range if it's just one day + else: + date_str = "%s to %s" % (dates[-notification_period], dates[-1]) + + prologue = "=======================\n" + prologue += "Automatic Censorship Report for %s\n" % (date_str) + prologue += "=======================\n\n" + report_file.write(prologue) ## Make a league table of censorship + nice graphs def plot_all(tss, minx, maxx, INTERV, DAYS=None, rdir="img"): @@ -388,10 +398,7 @@ def write_ml_report(tss, minx, maxx, INTERV, DAYS, notification_period=None): for downscores,users_n,upscores,country_code in scores: if (downscores > 0) or (upscores > 0): if not file_prologue_written: - prologue = "=======================\n" - prologue += "Automatic Censorship Report for %s to %s\n" % (tss.all_dates[-notification_period], tss.all_dates[-1]) - prologue += "=======================\n\n" - report_file.write(prologue) + write_censorship_report_prologue(report_file, tss.all_dates, notification_period) file_prologue_written = True if ((upscores > 0) and (downscores == 0)):

1 0

[tor/master] fix the typo on the typo fix
by arma＠torproject.org 16 Jun '12

16 Jun '12

commit c37b8023b70f7667db342ffd4c998df6b929f4e4 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 15 20:34:16 2012 -0400 fix the typo on the typo fix --- src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 2630020..e731a1c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1052,7 +1052,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, * believe that matters, since you would need to open a ridiculous * number of listeners while keeping the early ones open before you ever * hit this. An OR with a dozen ports open, for example, would have to - * close and re-open its listenerrs every second for 4 years nonstop. + * close and re-open its listeners every second for 4 years nonstop. */ lis_conn->session_group = global_next_session_group--; }

1 0

[ooni-probe/master] Refactor test tester
by art＠torproject.org 15 Jun '12

15 Jun '12

commit 3e85b9e1e589c08889c4607b9597775a6144e465 Author: Arturo Filastò <art(a)baculo.org> Date: Fri Jun 15 23:30:39 2012 +0200 Refactor test tester --- tests/test_tests.py | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/test_tests.py b/tests/test_tests.py index 702e6a3..bed5922 100644 --- a/tests/test_tests.py +++ b/tests/test_tests.py @@ -1,3 +1,4 @@ +from twisted.internet import defer from twisted.trial import unittest from ooni.plugoo import work, tests @@ -12,11 +13,15 @@ class TestsTestCase(unittest.TestCase): self.errbackResults = None def _callback(self, *args, **kw): + print "BBB" + print args, kw + print "CCCC" self.callbackResults = args, kw def _errback(self, *args, **kw): pass + @defer.inlineCallbacks def test_fallThrough(self): """ This tests to make sure that what is returned from the experiment @@ -24,10 +29,16 @@ class TestsTestCase(unittest.TestCase): """ test_dict = {"hello": "world"} class DummyTest(tests.OONITest): + blocking = False def experiment(self, args): - return test_dict + def cb(aaa): + return test_dict + d = defer.Deferred() + d.addCallback(cb) + d.callback(None) + return d test = DummyTest(None, None, self.dummyreport) - test.startTest(None).addCallback(self._callback) - self.assertEqual(self.callbackResults[0][0]['result'], test_dict) + yield test.startTest(None).addCallback(self._callback) + self.assertEqual(self.callbackResults[0][0]['control'], test_dict)

1 0

[tor/master] fix typos from 783f705d
by arma＠torproject.org 15 Jun '12

15 Jun '12

commit ca525db02dbb026bda4305881476dada754c3ca3 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 15 17:08:25 2012 -0400 fix typos from 783f705d --- src/or/connection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index c22068b..2630020 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1048,11 +1048,11 @@ connection_listener_new(const struct sockaddr *listensockaddr, if (port_cfg->session_group >= 0) { lis_conn->session_group = port_cfg->session_group; } else { - /* This can wrap afuter ~INT_MAX listeners are opened. But I don't + /* This can wrap after around INT_MAX listeners are opened. But I don't * believe that matters, since you would need to open a ridiculous * number of listeners while keeping the early ones open before you ever * hit this. An OR with a dozen ports open, for example, would have to - * close and re-open its listers every second for 4 years nonstop. + * close and re-open its listenerrs every second for 4 years nonstop. */ lis_conn->session_group = global_next_session_group--; }

1 0

[tor/master] fix a compiler warning added in one of my XXX023 fixes.
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit 97555f453741c41891461d850ab16452fb6b7131 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 16:43:59 2012 -0400 fix a compiler warning added in one of my XXX023 fixes. --- src/common/compat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 06eb583..ca850a3 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1311,7 +1311,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) limit = rlim.rlim_max; if (limit > INT_MAX) limit = INT_MAX; - *max_out = limit - ULIMIT_BUFFER; + *max_out = (int)limit - ULIMIT_BUFFER; return 0; } if (rlim.rlim_max < limit) {

1 0

[tor/master] Fix a typo found by Mike.
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit eab75d2c36a4b6ee4bd634f7eff8fe6fa00b6c1c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 16:12:04 2012 -0400 Fix a typo found by Mike. --- src/or/microdesc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index d5a27d5..42e8605 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -644,9 +644,9 @@ microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache, if (skip && digestmap_get(skip, rs->descriptor_digest)) continue; if (tor_mem_is_zero(rs->descriptor_digest, DIGEST256_LEN)) { - log_info(LD_BUG, "Found an entry in networktatus with no microdescriptor " - "digest. (Router %s=%s at %s:%d.)", rs->nickname, - hex_str(rs->identity_digest, DIGEST_LEN), + log_info(LD_BUG, "Found an entry in networkstatus with no " + "microdescriptor digest. (Router %s=%s at %s:%d.)", + rs->nickname, hex_str(rs->identity_digest, DIGEST_LEN), fmt_addr32(rs->addr), rs->or_port); continue; }

1 0

[tor/master] Whitespace fix
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit 30c4653780daa1c70946ed78c102eeab8adb2fe6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 16:12:24 2012 -0400 Whitespace fix --- src/common/compat_libevent.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 544d16a..6655ca8 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -723,3 +723,4 @@ tor_gettimeofday_cache_clear(void) cached_time_hires.tv_sec = 0; } #endif +

1 0

[tor/master] Triage the XXX023 and XXX022 comments: postpone many.
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit 2491fff5a6fda1c1e2044d332e551907a579929d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 09:37:40 2012 -0400 Triage the XXX023 and XXX022 comments: postpone many. --- src/common/address.c | 2 +- src/common/compat.c | 2 +- src/or/buffers.c | 6 +++--- src/or/circuitbuild.c | 8 ++++---- src/or/circuitlist.c | 4 ++-- src/or/circuituse.c | 4 ++-- src/or/config.c | 4 ++-- src/or/connection.c | 6 +++--- src/or/connection_edge.c | 18 +++++++++--------- src/or/connection_or.c | 2 +- src/or/dirserv.c | 12 ++++++------ src/or/dnsserv.c | 2 +- src/or/main.c | 7 ++----- src/or/microdesc.c | 2 +- src/or/networkstatus.c | 2 +- src/or/relay.c | 4 ++-- src/or/rendclient.c | 2 +- src/or/rendservice.c | 4 ++-- src/or/rephist.c | 2 +- src/or/routerlist.c | 10 +++++----- src/or/routerparse.c | 2 +- src/or/transports.c | 2 +- 22 files changed, 52 insertions(+), 55 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index e56465f..30665fa 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1363,7 +1363,7 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) /* ====== * IPv4 helpers - * XXXX023 IPv6 deprecate some of these. + * XXXX024 IPv6 deprecate some of these. */ /** Return true iff ip (in host order) is an IP reserved to localhost, diff --git a/src/common/compat.c b/src/common/compat.c index 71e39b6..7dfc688 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -15,7 +15,7 @@ /* This is required on rh7 to make strptime not complain. * We also need it to make memmem get defined (where available) */ -/* XXXX023 We should just use AC_USE_SYSTEM_EXTENSIONS in our autoconf, +/* XXXX024 We should just use AC_USE_SYSTEM_EXTENSIONS in our autoconf, * and get this (and other important stuff!) automatically. Once we do that, * make sure to also change the extern char **environ detection in * configure.in, because whether that is declared or not depends on whether diff --git a/src/or/buffers.c b/src/or/buffers.c index be1bdd3..9acc229 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -677,12 +677,12 @@ read_to_chunk_tls(buf_t *buf, chunk_t *chunk, tor_tls_t *tls, * (because of EOF), set *reached_eof to 1 and return 0. Return -1 on * error; else return the number of bytes read. */ -/* XXXX023 indicate "read blocked" somehow? */ +/* XXXX024 indicate "read blocked" somehow? */ int read_to_buf(tor_socket_t s, size_t at_most, buf_t *buf, int *reached_eof, int *socket_error) { - /* XXXX023 It's stupid to overload the return values for these functions: + /* XXXX024 It's stupid to overload the return values for these functions: * "error status" and "number of bytes read" are not mutually exclusive. */ int r = 0; @@ -855,7 +855,7 @@ flush_chunk_tls(tor_tls_t *tls, buf_t *buf, chunk_t *chunk, int flush_buf(tor_socket_t s, buf_t *buf, size_t sz, size_t *buf_flushlen) { - /* XXXX023 It's stupid to overload the return values for these functions: + /* XXXX024 It's stupid to overload the return values for these functions: * "error status" and "number of bytes flushed" are not mutually exclusive. */ int r; diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 149383e..cfd1956 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -44,12 +44,12 @@ /********* START VARIABLES **********/ /** Global list of circuit build times */ -// XXXX023: Add this as a member for entry_guard_t instead of global? +// XXXX: Add this as a member for entry_guard_t instead of global? // Then we could do per-guard statistics, as guards are likely to // vary in their own latency. The downside of this is that guards // can change frequently, so we'd be building a lot more circuits // most likely. -/* XXXX023 Make this static; add accessor functions. */ +/* XXXX024 Make this static; add accessor functions. */ circuit_build_times_t circ_times; /** A global list of all circuits at this hop. */ @@ -4238,7 +4238,7 @@ entry_guards_compute_status(const or_options_t *options, time_t now) * If mark_relay_status, also call router_set_status() on this * relay. * - * XXX023 change succeeded and mark_relay_status into 'int flags'. + * XXX024 change succeeded and mark_relay_status into 'int flags'. */ int entry_guard_register_connect_status(const char *digest, int succeeded, @@ -4763,7 +4763,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) } entry_guards = new_entry_guards; entry_guards_dirty = 0; - /* XXX023 hand new_entry_guards to this func, and move it up a + /* XXX024 hand new_entry_guards to this func, and move it up a * few lines, so we don't have to re-dirty it */ if (remove_obsolete_entry_guards(now)) entry_guards_dirty = 1; diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 5e3370a..7ed942c 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1180,7 +1180,7 @@ circuit_mark_all_unused_circs(void) * This is useful for letting the user change pseudonyms, so new * streams will not be linkable to old streams. */ -/* XXX023 this is a bad name for what this function does */ +/* XXX024 this is a bad name for what this function does */ void circuit_expire_all_dirty_circs(void) { @@ -1191,7 +1191,7 @@ circuit_expire_all_dirty_circs(void) if (CIRCUIT_IS_ORIGIN(circ) && !circ->marked_for_close && circ->timestamp_dirty) - /* XXXX023 This is a screwed-up way to say "This is too dirty + /* XXXX024 This is a screwed-up way to say "This is too dirty * for new circuits. */ circ->timestamp_dirty -= options->MaxCircuitDirtiness; } diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 7532c4e..c34b698 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1475,7 +1475,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, return -1; } } else { - /* XXXX023 Duplicates checks in connection_ap_handshake_attach_circuit: + /* XXXX024 Duplicates checks in connection_ap_handshake_attach_circuit: * refactor into a single function? */ const node_t *node = node_get_by_nickname(conn->chosen_exit_name, 1); int opt = conn->chosen_exit_optional; @@ -1916,7 +1916,7 @@ connection_ap_handshake_attach_circuit(entry_connection_t *conn) /* find the circuit that we should use, if there is one. */ retval = circuit_get_open_circ_or_launch( conn, CIRCUIT_PURPOSE_C_GENERAL, &circ); - if (retval < 1) // XXX022 if we totally fail, this still returns 0 -RD + if (retval < 1) // XXX023 if we totally fail, this still returns 0 -RD return retval; log_debug(LD_APP|LD_CIRC, diff --git a/src/or/config.c b/src/or/config.c index 03e93e0..598051e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1692,7 +1692,7 @@ options_act(const or_options_t *old_options) || !geoip_is_loaded())) { /* XXXX Don't use this "<default>" junk; make our filename options * understand prefixes somehow. -NM */ - /* XXXX023 Reload GeoIPFile on SIGHUP. -NM */ + /* XXXX024 Reload GeoIPFile on SIGHUP. -NM */ char *actual_fname = tor_strdup(options->GeoIPFile); #ifdef _WIN32 if (!strcmp(actual_fname, "<default>")) { @@ -4103,7 +4103,7 @@ options_validate(or_options_t *old_options, or_options_t *options, "ignore you."); } - /*XXXX023 checking for defaults manually like this is a bit fragile.*/ + /*XXXX checking for defaults manually like this is a bit fragile.*/ /* Keep changes to hard-coded values synchronous to man page and default * values table. */ diff --git a/src/or/connection.c b/src/or/connection.c index 34e1a5c..9bbab19 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2280,7 +2280,7 @@ static void record_num_bytes_transferred(connection_t *conn, time_t now, size_t num_read, size_t num_written) { - /* XXX023 check if this is necessary */ + /* XXX024 check if this is necessary */ if (num_written >= INT_MAX || num_read >= INT_MAX) { log_err(LD_BUG, "Value out of range. num_read=%lu, num_written=%lu, " "connection type=%s, state=%s", @@ -2925,7 +2925,7 @@ evbuffer_inbuf_callback(struct evbuffer *buf, connection_consider_empty_read_buckets(conn); if (conn->type == CONN_TYPE_AP) { edge_connection_t *edge_conn = TO_EDGE_CONN(conn); - /*XXXX022 check for overflow*/ + /*XXXX024 check for overflow*/ edge_conn->n_read += (int)info->n_added; } } @@ -2946,7 +2946,7 @@ evbuffer_outbuf_callback(struct evbuffer *buf, connection_consider_empty_write_buckets(conn); if (conn->type == CONN_TYPE_AP) { edge_connection_t *edge_conn = TO_EDGE_CONN(conn); - /*XXXX022 check for overflow*/ + /*XXXX024 check for overflow*/ edge_conn->n_written += (int)info->n_deleted; } } diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index eae19ba..210c2e0 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -76,7 +76,7 @@ _connection_mark_unattached_ap(entry_connection_t *conn, int endreason, * being attached to a circuit, assume that an attempt to connect to * the destination hidden service has just ended. * - * XXX023 This condition doesn't limit to only streams failing + * XXXX This condition doesn't limit to only streams failing * without ever being attached. That sloppiness should be harmless, * but we should fix it someday anyway. */ if ((edge_conn->on_circuit != NULL || edge_conn->edge_has_sent_end) && @@ -622,7 +622,7 @@ connection_ap_expire_beginning(void) /* kludge to make us not try this circuit again, yet to allow * current streams on it to survive if they can: make it * unattractive to use for new streams */ - /* XXXX023 this is a kludgy way to do this. */ + /* XXXX024 this is a kludgy way to do this. */ tor_assert(circ->timestamp_dirty); circ->timestamp_dirty -= options->MaxCircuitDirtiness; /* give our stream another 'cutoff' seconds to try */ @@ -664,7 +664,7 @@ connection_ap_attach_pending(void) /** Tell any AP streams that are waiting for a one-hop tunnel to * failed_digest that they are going to fail. */ -/* XXX023 We should get rid of this function, and instead attach +/* XXX024 We should get rid of this function, and instead attach * one-hop streams to circ->p_streams so they get marked in * circuit_mark_for_close like normal p_streams. */ void @@ -1991,7 +1991,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); return -1; } - /* XXXX022-1090 Should we also allow foo.bar.exit if ExitNodes is set and + /* XXXX024-1090 Should we also allow foo.bar.exit if ExitNodes is set and Bar is not listed in it? I say yes, but our revised manpage branch implies no. */ } @@ -2572,12 +2572,12 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn) edge_conn->stream_id = get_unique_stream_id_by_circ(circ); if (edge_conn->stream_id==0) { - /* XXXX023 Instead of closing this stream, we should make it get + /* XXXX024 Instead of closing this stream, we should make it get * retried on another circuit. */ connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); /* Mark this circuit "unusable for new streams". */ - /* XXXX023 this is a kludgy way to do this. */ + /* XXXX024 this is a kludgy way to do this. */ tor_assert(circ->_base.timestamp_dirty); circ->_base.timestamp_dirty -= get_options()->MaxCircuitDirtiness; return -1; @@ -2657,12 +2657,12 @@ connection_ap_handshake_send_resolve(entry_connection_t *ap_conn) edge_conn->stream_id = get_unique_stream_id_by_circ(circ); if (edge_conn->stream_id==0) { - /* XXXX023 Instead of closing this stream, we should make it get + /* XXXX024 Instead of closing this stream, we should make it get * retried on another circuit. */ connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); /* Mark this circuit "unusable for new streams". */ - /* XXXX023 this is a kludgy way to do this. */ + /* XXXX024 this is a kludgy way to do this. */ tor_assert(circ->_base.timestamp_dirty); circ->_base.timestamp_dirty -= get_options()->MaxCircuitDirtiness; return -1; @@ -2834,7 +2834,7 @@ tell_controller_about_resolved_result(entry_connection_t *conn, * certain errors or for values that didn't come via DNS. expires is * a time when the answer expires, or -1 or TIME_MAX if there's a good TTL. **/ -/* XXXX023 the use of the ttl and expires fields is nutty. Let's make this +/* XXXX the use of the ttl and expires fields is nutty. Let's make this * interface and those that use it less ugly. */ void connection_ap_handshake_socks_resolved(entry_connection_t *conn, diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 467e169..d016387 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -401,7 +401,7 @@ connection_or_process_inbuf(or_connection_t *conn) * check would otherwise just let data accumulate. It serves no purpose * in 0.2.3. * - * XXX023 Remove this check once we verify that the above paragraph is + * XXX024 Remove this check once we verify that the above paragraph is * 100% true. */ if (buf_datalen(conn->_base.inbuf) > MAX_OR_INBUF_WHEN_NONOPEN) { log_fn(LOG_PROTOCOL_WARN, LD_NET, "Accumulated too much data (%d bytes) " diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 67b18fb..bfebbcd 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -975,7 +975,7 @@ running_long_enough_to_decide_unreachable(void) void dirserv_set_router_is_running(routerinfo_t *router, time_t now) { - /*XXXX023 This function is a mess. Separate out the part that calculates + /*XXXX024 This function is a mess. Separate out the part that calculates whether it's reachable and the part that tells rephist that the router was unreachable. */ @@ -1793,7 +1793,7 @@ dirserv_thinks_router_is_unreliable(time_t now, { if (need_uptime) { if (!enough_mtbf_info) { - /* XXX023 Once most authorities are on v3, we should change the rule from + /* XXX024 Once most authorities are on v3, we should change the rule from * "use uptime if we don't have mtbf data" to "don't advertise Stable on * v3 if we don't have enough mtbf data." Or maybe not, since if we ever * hit a point where we need to reset a lot of authorities at once, @@ -2321,7 +2321,7 @@ is_router_version_good_for_possible_guard(const char *platform) tor_version_t router_version; - /* XXX023 This block should be extracted into its own function. */ + /* XXX024 This block should be extracted into its own function. */ /* XXXX Begin code copied from tor_version_as_new_as (in routerparse.c) */ { char *s, *s2, *start; @@ -3402,7 +3402,7 @@ lookup_cached_dir_by_fp(const char *fp) d = strmap_get(cached_consensuses, "ns"); else if (memchr(fp, '\0', DIGEST_LEN) && cached_consensuses && (d = strmap_get(cached_consensuses, fp))) { - /* this here interface is a nasty hack XXXX023 */; + /* this here interface is a nasty hack XXXX024 */; } else if (router_digest_is_me(fp) && the_v2_networkstatus) d = the_v2_networkstatus; else if (cached_v2_networkstatus) @@ -3613,7 +3613,7 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) } body = signed_descriptor_get_body(sd); if (conn->zlib_state) { - /* XXXX022 This 'last' business should actually happen on the last + /* XXXX024 This 'last' business should actually happen on the last * routerinfo, not on the last fingerprint. */ int last = ! smartlist_len(conn->fingerprint_stack); connection_write_to_buf_zlib(body, sd->signed_descriptor_len, conn, @@ -3656,7 +3656,7 @@ connection_dirserv_add_microdescs_to_outbuf(dir_connection_t *conn) if (!md) continue; if (conn->zlib_state) { - /* XXXX022 This 'last' business should actually happen on the last + /* XXXX024 This 'last' business should actually happen on the last * routerinfo, not on the last fingerprint. */ int last = !smartlist_len(conn->fingerprint_stack); connection_write_to_buf_zlib(md->body, md->bodylen, conn, last); diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 183c5b8..69adcef 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -19,7 +19,7 @@ #ifdef HAVE_EVENT2_DNS_H #include <event2/dns.h> #include <event2/dns_compat.h> -/* XXXX023 this implies we want an improved evdns */ +/* XXXX this implies we want an improved evdns */ #include <event2/dns_struct.h> #else #include "eventdns.h" diff --git a/src/or/main.c b/src/or/main.c index d9d64ce..f8740d7 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1435,11 +1435,8 @@ run_scheduled_events(time_t now) * We do this before step 4, so it can try building more if * it's not comfortable with the number of available circuits. */ - /* XXXX022 If our circuit build timeout is much lower than a second, maybe - * we should do this more often? -NM - * It can't be lower than 1.5 seconds currently; see - * circuit_build_times_min_timeout(). -RD - */ + /* (If our circuit build timeout can ever become lower than a second (which + * it can't, currently), we should do this more often.) */ circuit_expire_building(); /** 3b. Also look at pending streams and prune the ones that 'began' diff --git a/src/or/microdesc.c b/src/or/microdesc.c index ba6c88f..10dab25 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -477,7 +477,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) md->body = (char*)cache->cache_content->data + md->off; if (PREDICT_UNLIKELY( md->bodylen < 9 || fast_memneq(md->body, "onion-key", 9) != 0)) { - /* XXXX023 once bug 2022 is solved, we can kill this block and turn it + /* XXXX once bug 2022 is solved, we can kill this block and turn it * into just the tor_assert(!memcmp) */ off_t avail = cache->cache_content->size - md->off; char *bad_str; diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index e787ec5..745176d 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1836,7 +1836,7 @@ networkstatus_set_current_consensus(const char *consensus, routerstatus_list_update_named_server_map(); cell_ewma_set_scale_factor(options, current_consensus); - /* XXXX023 this call might be unnecessary here: can changing the + /* XXXX024 this call might be unnecessary here: can changing the * current consensus really alter our view of any OR's rate limits? */ connection_or_update_token_buckets(get_connection_array(), options); diff --git a/src/or/relay.c b/src/or/relay.c index 0c99c34..8bbc989 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -799,7 +799,7 @@ connection_ap_process_end_not_open( /* We haven't retried too many times; reattach the connection. */ circuit_log_path(LOG_INFO,LD_APP,circ); /* Mark this circuit "unusable for new streams". */ - /* XXXX023 this is a kludgy way to do this. */ + /* XXXX024 this is a kludgy way to do this. */ tor_assert(circ->_base.timestamp_dirty); circ->_base.timestamp_dirty -= get_options()->MaxCircuitDirtiness; @@ -1462,7 +1462,7 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial, stats_n_data_cells_packaged += 1; if (PREDICT_UNLIKELY(sending_from_optimistic)) { - /* XXX023 We could be more efficient here by sometimes packing + /* XXXX We could be more efficient here by sometimes packing * previously-sent optimistic data in the same cell with data * from the inbuf. */ generic_buffer_get(entry_conn->sending_optimistic_data, payload, length); diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 79e017b..6c751be 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -830,7 +830,7 @@ rend_client_rendezvous_acked(origin_circuit_t *circ, const uint8_t *request, /* Set timestamp_dirty, because circuit_expire_building expects it * to specify when a circuit entered the _C_REND_READY state. */ circ->_base.timestamp_dirty = time(NULL); - /* XXXX023 This is a pretty brute-force approach. It'd be better to + /* XXXX This is a pretty brute-force approach. It'd be better to * attach only the connections that are waiting on this circuit, rather * than trying to attach them all. See comments bug 743. */ /* If we already have the introduction circuit built, make sure we send diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 5ffc586..11e80b7 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1033,7 +1033,7 @@ rend_service_note_removing_intro_point(rend_service_t *service, /** Respond to an INTRODUCE2 cell by launching a circuit to the chosen * rendezvous point. */ - /* XXX022 this function sure could use some organizing. -RD */ + /* XXXX024 this function sure could use some organizing. -RD */ int rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, size_t request_len) @@ -2255,7 +2255,7 @@ rend_services_introduce(void) * * Unfortunately, we can't find out when the new descriptor * has actually been uploaded, so we'll have to settle for a - * five-minute timer. Start it. XXX023 This sucks. */ + * five-minute timer. Start it. XXXX024 This sucks. */ intro->time_expiring = now; intro_point_set_changed = 1; diff --git a/src/or/rephist.c b/src/or/rephist.c index 341a5a3..720d14c 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -588,7 +588,7 @@ rep_hist_get_weighted_time_known(const char *id, time_t when) int rep_hist_have_measured_enough_stability(void) { - /* XXXX022 This doesn't do so well when we change our opinion + /* XXXX023 This doesn't do so well when we change our opinion * as to whether we're tracking router stability. */ return started_tracking_stability < time(NULL) - 4*60*60; } diff --git a/src/or/routerlist.c b/src/or/routerlist.c index feda4f1..490c123 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1831,7 +1831,7 @@ smartlist_choose_node_by_bandwidth_weights(smartlist_t *sl, sl_last_weighted_bw_of_me = weight*this_bw; } SMARTLIST_FOREACH_END(node); - /* XXXX023 this is a kludge to expose these values. */ + /* XXXX this is a kludge to expose these values. */ sl_last_total_weighted_bw = weighted_bw; log_debug(LD_CIRC, "Choosing node for rule %s based on weights " @@ -1960,7 +1960,7 @@ smartlist_choose_node_by_bandwidth(smartlist_t *sl, if (node->rs->has_bandwidth) { this_bw = kb_to_bytes(node->rs->bandwidth); } else { /* guess */ - /* XXX023 once consensuses always list bandwidths, we can take + /* XXX024 once consensuses always list bandwidths, we can take * this guessing business out. -RD */ is_known = 0; flags = node->rs->is_fast ? 1 : 0; @@ -2079,7 +2079,7 @@ smartlist_choose_node_by_bandwidth(smartlist_t *sl, } } - /* XXXX023 this is a kludge to expose these values. */ + /* XXXX this is a kludge to expose these values. */ sl_last_total_weighted_bw = total_bw; log_debug(LD_CIRC, "Total weighted bw = "U64_FORMAT @@ -4753,7 +4753,7 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote, /** How often should we launch a server/authority request to be sure of getting * a guess for our IP? */ -/*XXXX023 this info should come from netinfo cells or something, or we should +/*XXXX024 this info should come from netinfo cells or something, or we should * do this only when we aren't seeing incoming data. see bug 652. */ #define DUMMY_DOWNLOAD_INTERVAL (20*60) @@ -4764,7 +4764,7 @@ launch_dummy_descriptor_download_as_needed(time_t now, const or_options_t *options) { static time_t last_dummy_download = 0; - /* XXXX023 we could be smarter here; see notes on bug 652. */ + /* XXXX024 we could be smarter here; see notes on bug 652. */ /* If we're a server that doesn't have a configured address, we rely on * directory fetches to learn when our address changes. So if we haven't * tried to get any routerdescs in a long time, try a dummy fetch now. */ diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 6308f3a..37609bd 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1836,7 +1836,7 @@ authority_cert_parse_from_string(const char *s, const char **end_of_string) struct in_addr in; char *address = NULL; tor_assert(tok->n_args); - /* XXX023 use some tor_addr parse function below instead. -RD */ + /* XXX024 use some tor_addr parse function below instead. -RD */ if (tor_addr_port_split(LOG_WARN, tok->args[0], &address, &cert->dir_port) < 0 || tor_inet_aton(address, &in) == 0) { diff --git a/src/or/transports.c b/src/or/transports.c index 2fc2adc..1522756 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1002,7 +1002,7 @@ create_managed_proxy_environment(const managed_proxy_t *mp) tor_free(bindaddr_tmp); } - /* XXX023 Remove the '=' here once versions of obfsproxy which + /* XXX024 Remove the '=' here once versions of obfsproxy which * assert that this env var exists are sufficiently dead. * * (If we remove this line entirely, some joker will stick this

1 0

[tor/master] Document that we are unlikely to underflow session group IDs.
by nickm＠torproject.org 15 Jun '12

15 Jun '12

commit 783f705ddc507c082ab53b556317680447f046f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 10:05:21 2012 -0400 Document that we are unlikely to underflow session group IDs. --- src/or/connection.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 9bbab19..c22068b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1048,7 +1048,12 @@ connection_listener_new(const struct sockaddr *listensockaddr, if (port_cfg->session_group >= 0) { lis_conn->session_group = port_cfg->session_group; } else { - /* XXXX023 This can wrap after ~INT_MAX ports are opened. */ + /* This can wrap afuter ~INT_MAX listeners are opened. But I don't + * believe that matters, since you would need to open a ridiculous + * number of listeners while keeping the early ones open before you ever + * hit this. An OR with a dozen ports open, for example, would have to + * close and re-open its listers every second for 4 years nonstop. + */ lis_conn->session_group = global_next_session_group--; } }

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2012