aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-12-22 10:12:49 -0500
committerNick Mathewson <nickm@torproject.org>2011-12-22 10:12:49 -0500
commit2710a96ba4a25bf7d2f3a8ddca7120fbb6aa2cb0 (patch)
tree498f7fb95c4ece9900f275ad7ae2641d0cbc9106 /src/or
parent847541ce5db48152576639d7adc0a6209b661be9 (diff)
downloadtor-2710a96ba4a25bf7d2f3a8ddca7120fbb6aa2cb0.tar
tor-2710a96ba4a25bf7d2f3a8ddca7120fbb6aa2cb0.tar.gz
Allow prop110 violations if AllowNonearlyExtend is set in consensus
Diffstat (limited to 'src/or')
-rw-r--r--src/or/relay.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index fdc26006a..e5790dc5e 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1196,7 +1196,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
"'extend' cell received for non-zero stream. Dropping.");
return 0;
}
- if (cell->command != CELL_RELAY_EARLY) {
+ if (cell->command != CELL_RELAY_EARLY &&
+ !networkstatus_get_param(NULL,"AllowNonearlyExtend",0,0,1)) {
#define EARLY_WARNING_INTERVAL 900
static ratelim_t early_warning_limit =
RATELIM_INIT(EARLY_WARNING_INTERVAL);