summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-02-21 05:53:50 +0000
committerRoger Dingledine <arma@torproject.org>2008-02-21 05:53:50 +0000
commitb28a342e352ae7c94130382442507f96a80c427e (patch)
treed887a65d77c1f7df13fe5bbf2f65d4b594d62916
parent1812a22a60eca8614dccda990099a8e2efd388b6 (diff)
downloadtor-b28a342e352ae7c94130382442507f96a80c427e.tar.gz
tor-b28a342e352ae7c94130382442507f96a80c427e.zip
resolve one more, and leave two for nick.
svn:r13644
-rw-r--r--src/common/tortls.c3
-rw-r--r--src/or/connection.c3
-rw-r--r--src/or/dns.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index ed5bf30b8b..2259d9e5a7 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -285,7 +285,8 @@ tor_tls_get_error(tor_tls_t *tls, int r, int extra,
log(severity, LD_NET, "TLS error: Zero return");
tls_log_errors(tls, severity, doing);
/* XXXX020rc Actually, a 'zero return' error has a pretty specific
- * meaning: the connection has been closed cleanly. */
+ * meaning: the connection has been closed cleanly. -NM
+ * Great. Do something smart here then. :) -RD */
return TOR_TLS_ERROR_MISC;
default:
tls_log_errors(tls, severity, doing);
diff --git a/src/or/connection.c b/src/or/connection.c
index 3b4ef79d3e..408fbec17b 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1861,7 +1861,8 @@ loop_again:
* we need to invoke the appropriate callbacks ourself. */
connection_t *linked = conn->linked_conn;
/* XXXX020rc Do we need to ensure that this stuff is called even if
- * conn dies in a way that causes us to return -1 earlier? */
+ * conn dies in a way that causes us to return -1 earlier? -NM
+ * No idea. -RD */
if (n_read) {
/* Probably a no-op, but hey. */
diff --git a/src/or/dns.c b/src/or/dns.c
index 63c9b4e10a..376e50ecc5 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -592,6 +592,8 @@ dns_resolve(edge_connection_t *exitconn)
// main.c. -NM
// "<armadev> If that's true, there are other bugs around, where we
// don't check if it's marked, and will end up double-freeing."
+ // On the other hand, I don't know of any actual bugs here, so this
+ // shouldn't be holding up the rc. -RD
}
break;
default: