diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-07-01 17:37:59 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-07-01 17:37:59 -0400 |
| commit | 46434ecf5b6f1ad88deb86fdac044c41ae4b534b (patch) | |
| tree | 791b0f0bd0b1f1864e94cd1d7b7fc098764dc52a /src | |
| parent | 6061cd584c129eb8b5ed24fb5ce686a0236913e4 (diff) | |
| parent | d13389b30ec2e17a8f08a00f82fac420ae968cd1 (diff) | |
| download | tor-46434ecf5b6f1ad88deb86fdac044c41ae4b534b.tar tor-46434ecf5b6f1ad88deb86fdac044c41ae4b534b.tar.gz | |
Merge branch 'maint-0.2.3'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/relay.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 4ab440384..3f894bfe1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1265,25 +1265,11 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, case RELAY_COMMAND_SENDME: if (!conn) { if (layer_hint) { - if (layer_hint->package_window + CIRCWINDOW_INCREMENT > - CIRCWINDOW_START_MAX) { - log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, - "Bug/attack: unexpected sendme cell from exit relay. " - "Closing circ."); - return -END_CIRC_REASON_TORPROTOCOL; - } layer_hint->package_window += CIRCWINDOW_INCREMENT; log_debug(LD_APP,"circ-level sendme at origin, packagewindow %d.", layer_hint->package_window); circuit_resume_edge_reading(circ, layer_hint); } else { - if (circ->package_window + CIRCWINDOW_INCREMENT > - CIRCWINDOW_START_MAX) { - log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, - "Bug/attack: unexpected sendme cell from client. " - "Closing circ."); - return -END_CIRC_REASON_TORPROTOCOL; - } circ->package_window += CIRCWINDOW_INCREMENT; log_debug(LD_APP, "circ-level sendme at non-origin, packagewindow %d.", |