aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-02-06 00:27:03 +0000
committerRoger Dingledine <arma@torproject.org>2007-02-06 00:27:03 +0000
commit9aa8e490f87a27d81dbc0863b39f6b9d0da695bb (patch)
tree539be094a718f7bd6fb839349842037ecad82d91 /src
parent6a2fe560158513e9142bd38a1a43535d87c4a825 (diff)
downloadtor-9aa8e490f87a27d81dbc0863b39f6b9d0da695bb.tar
tor-9aa8e490f87a27d81dbc0863b39f6b9d0da695bb.tar.gz
cleanups based on looking through svn commits
svn:r9491
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitbuild.c2
-rw-r--r--src/or/connection_or.c9
2 files changed, 8 insertions, 3 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 5ae6ceeeb..f1571d5d3 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1735,7 +1735,7 @@ extend_info_from_routerstatus(routerstatus_t *s)
info = tor_malloc_zero(sizeof(extend_info_t));
strlcpy(info->nickname, s->nickname, sizeof(info->nickname));
memcpy(info->identity_digest, s->identity_digest, DIGEST_LEN);
- info->onion_key = NULL; /* routerstatus doesn't include this! */
+ info->onion_key = NULL; /* routerstatus doesn't know this */
info->addr = s->addr;
info->port = s->or_port;
return info;
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index b234e906a..d17191486 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -779,9 +779,14 @@ connection_or_send_destroy(uint16_t circ_id, or_connection_t *conn, int reason)
return 0;
}
-/** DOCDOC */
+/** A high waterlevel for whether to refill this OR connection
+ * with more directory information, if any is pending. */
#define BUF_FULLNESS_THRESHOLD (128*1024)
-/** DOCDOC */
+/** A bottom waterlevel for whether to refill this OR connection
+ * with more directory information, if any is pending. We don't want
+ * to make this too low, since we already run the risk of starving
+ * the pending dir connections if the OR conn is frequently busy with
+ * other things. */
#define BUF_EMPTINESS_THRESHOLD (96*1024)
/** Return true iff there is so much data waiting to be flushed on <b>conn</b>