[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r9655: more cleanups; getting closer (in tor/trunk: . doc doc/spec src/common src/or)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r9655: more cleanups; getting closer (in tor/trunk: . doc doc/spec src/common src/or)
- From: arma@xxxxxxxx
- Date: Mon, 26 Feb 2007 00:36:16 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Mon, 26 Feb 2007 00:36:37 -0500
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: arma
Date: 2007-02-26 00:36:02 -0500 (Mon, 26 Feb 2007)
New Revision: 9655
Modified:
tor/trunk/ChangeLog
tor/trunk/doc/TODO
tor/trunk/doc/spec/control-spec.txt
tor/trunk/src/common/compat.c
tor/trunk/src/common/container.h
tor/trunk/src/or/directory.c
tor/trunk/src/or/main.c
tor/trunk/src/or/relay.c
tor/trunk/src/or/router.c
Log:
more cleanups; getting closer
Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog 2007-02-26 05:33:17 UTC (rev 9654)
+++ tor/trunk/ChangeLog 2007-02-26 05:36:02 UTC (rev 9655)
@@ -6,12 +6,16 @@
arguments: don't try to load NT service functions from advapi32.dll
except when we need them. (Bug introduced in 0.1.2.7-alpha;
resolves bug 389.)
+ - Fix a longstanding obscure crash bug that could occur when
+ we run out of DNS worker processes. (Resolves bug 390.)
+ o Major bugfixes (hidden services):
+ - Correctly detect whether hidden service descriptor downloads are
+ in-progress. (Suggested by Karsten Loesing; fixes bug 399.)
+
o Major bugfixes (accounting):
- When we start during an accounting interval before it's time to wake
up, remember to wake up at the correct time. (May fix bug 342.)
- - Fix a longstanding obscure crash bug that could occur when
- we run out of DNS worker processes. (Resolves bug 390.)
o Minor bugfixes (controller):
- Give the controller END_STREAM_REASON_DESTROY events _before_ we
@@ -59,8 +63,6 @@
DNS request.
- Build with recent libevents on platforms that do not define the
nonstandard types "u_int8_t" and friends.
- - Correctly detect whether hidden service descriptor downloads are
- in-progress. (Fixes bug 399.)
o Minor features (controller):
- Warn the user when an application uses the obsolete binary v0
Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO 2007-02-26 05:33:17 UTC (rev 9654)
+++ tor/trunk/doc/TODO 2007-02-26 05:36:02 UTC (rev 9655)
@@ -412,6 +412,8 @@
of edge_stream_t.
Future version:
+ - LD_BUG log messages could prepend "Bug: " automatically, so we don't
+ have to try to remember to.
- More consistent error checking in router_parse_entry_from_string().
I can say "banana" as my bandwidthcapacity, and it won't even squeak.
- Include the output of svn info/svk info output into the binary, so
Modified: tor/trunk/doc/spec/control-spec.txt
===================================================================
--- tor/trunk/doc/spec/control-spec.txt 2007-02-26 05:33:17 UTC (rev 9654)
+++ tor/trunk/doc/spec/control-spec.txt 2007-02-26 05:36:02 UTC (rev 9655)
@@ -896,11 +896,10 @@
Reason = "MISC" / "DONE" / "CONNECTREFUSED" /
"IDENTITY" / "CONNECTRESET" / "TIMEOUT" / "NOROUTE" /
- "IOERROR"
+ "IOERROR"
NumCircuits counts both established and pending circuits.
-
4.1.4. Bandwidth used in the last second
The syntax is:
Modified: tor/trunk/src/common/compat.c
===================================================================
--- tor/trunk/src/common/compat.c 2007-02-26 05:33:17 UTC (rev 9654)
+++ tor/trunk/src/common/compat.c 2007-02-26 05:36:02 UTC (rev 9655)
@@ -990,7 +990,7 @@
void (*func)(void *);
void *data;
} tor_pthread_data_t;
-/** Given a tor_pthread_data_t <b>_data</b>, call _data->func(d->data);,
+/** Given a tor_pthread_data_t <b>_data</b>, call _data->func(d->data)
* and free _data. Used to make sure we can call functions the way pthread
* expects. */
static void *
Modified: tor/trunk/src/common/container.h
===================================================================
--- tor/trunk/src/common/container.h 2007-02-26 05:33:17 UTC (rev 9654)
+++ tor/trunk/src/common/container.h 2007-02-26 05:36:02 UTC (rev 9655)
@@ -157,7 +157,7 @@
} } while (0)
/** Helper: While in a SMARTLIST_FOREACH loop over the list <b>sl</b> indexed
- * with the variable <b>var</b>, remover the current element in a way that
+ * with the variable <b>var</b>, remove the current element in a way that
* won't confuse the loop. */
#define SMARTLIST_DEL_CURRENT(sl, var) \
do { \
Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c 2007-02-26 05:33:17 UTC (rev 9654)
+++ tor/trunk/src/or/directory.c 2007-02-26 05:36:02 UTC (rev 9655)
@@ -712,7 +712,8 @@
if (fwd) {
struct in_addr in;
if (!tor_inet_aton(fwd, &in) || is_internal_IP(ntohl(in.s_addr), 0)) {
- log_debug(LD_DIR, "Ignoring unrecognized or internal IP '%s'", fwd);
+ log_debug(LD_DIR, "Ignoring unrecognized or internal IP %s",
+ escaped(fwd));
tor_free(fwd);
return;
}
Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c 2007-02-26 05:33:17 UTC (rev 9654)
+++ tor/trunk/src/or/main.c 2007-02-26 05:36:02 UTC (rev 9655)
@@ -974,7 +974,8 @@
}
}
-/** Libevent timer: used to invoke second_elapsed_callback() once per second. */
+/** Libevent timer: used to invoke second_elapsed_callback() once per
+ * second. */
static struct event *timeout_event = NULL;
/** Number of libevent errors in the last second: we die if we get too many. */
static int n_libevent_errors = 0;
Modified: tor/trunk/src/or/relay.c
===================================================================
--- tor/trunk/src/or/relay.c 2007-02-26 05:33:17 UTC (rev 9654)
+++ tor/trunk/src/or/relay.c 2007-02-26 05:36:02 UTC (rev 9655)
@@ -829,9 +829,9 @@
return 0;
}
-/** Helper: change the socks_request->address field on conn to the dotted-quad
- * representation of <b>new_addr</b> (given in host order), and send an
- * appropriate REMAP event. */
+/** Helper: change the socks_request->address field on conn to the
+ * dotted-quad representation of <b>new_addr</b> (given in host order),
+ * and send an appropriate REMAP event. */
static void
remap_event_helper(edge_connection_t *conn, uint32_t new_addr)
{
@@ -873,7 +873,6 @@
"Got 'connected' while not in state connect_wait. Dropping.");
return 0;
}
- // log_fn(LOG_INFO,"Connected! Notifying application.");
conn->_base.state = AP_CONN_STATE_OPEN;
log_info(LD_APP,"'connected' received after %d seconds.",
(int)(time(NULL) - conn->_base.timestamp_lastread));
Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c 2007-02-26 05:33:17 UTC (rev 9654)
+++ tor/trunk/src/or/router.c 2007-02-26 05:36:02 UTC (rev 9655)
@@ -562,7 +562,7 @@
int cells_per_circuit = max_cells / num_circs;
origin_circuit_t *circ = NULL;
- log_notice(LD_OR,"Performing bandwidth self-test.");
+ log_notice(LD_OR,"Performing bandwidth self-test...done.");
while ((circ = circuit_get_next_by_pk_and_purpose(circ, NULL,
CIRCUIT_PURPOSE_TESTING))) {
/* dump cells_per_circuit drop cells onto this circ */