aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2002-08-23 06:49:43 +0000
committerRoger Dingledine <arma@torproject.org>2002-08-23 06:49:43 +0000
commitd8c0d21b4964e9c46d74d00a880e89a1d5814d91 (patch)
treea40c721df9dc68e50052ccfdbd220cf551c93363
parent5414786cf1447e3e994d0457adaa4ca0514acc1a (diff)
downloadtor-d8c0d21b4964e9c46d74d00a880e89a1d5814d91.tar
tor-d8c0d21b4964e9c46d74d00a880e89a1d5814d91.tar.gz
linkpadding is now off by default.
svn:r79
-rw-r--r--src/or/buffers.c9
-rw-r--r--src/or/config.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c
index d5c35aa4f..d9065eb41 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -6,6 +6,8 @@
#include "or.h"
+extern or_options_t options; /* command-line and config-file options */
+
int buf_new(char **buf, size_t *buflen, size_t *buf_datalen) {
assert(buf && buflen && buf_datalen);
@@ -45,6 +47,13 @@ int read_to_buf(int s, int at_most, char **buf, size_t *buflen, size_t *buf_data
if(at_most == 0)
return 0; /* we shouldn't read anything */
+ if(!options.LinkPadding && at_most > 10*sizeof(cell_t)) {
+ /* if no linkpadding. do a rudimentary round-robin so one
+ * connection can't hog our receiver bucket
+ */
+ at_most = 10*sizeof(cell_t);
+ }
+
// log(LOG_DEBUG,"read_to_buf(): reading at most %d bytes.",at_most);
read_result = read(s, *buf+*buf_datalen, at_most);
if (read_result < 0) {
diff --git a/src/or/config.c b/src/or/config.c
index 640044fc7..3977d494e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -99,7 +99,7 @@ RETURN VALUE: 0 on success, non-zero on error
options->LogLevel = "debug";
options->loglevel = LOG_DEBUG;
options->CoinWeight = 0.8;
- options->LinkPadding = 1;
+ options->LinkPadding = 0;
options->Role = ROLE_OR_LISTEN | ROLE_OR_CONNECT_ALL | ROLE_OP_LISTEN | ROLE_AP_LISTEN;
code = poptGetNextOpt(optCon); /* first we handle command-line args */