summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-04-07 21:01:00 +0000
committerRoger Dingledine <arma@torproject.org>2005-04-07 21:01:00 +0000
commitdd98412ce122b84a01fb01e24068c9d7e95cb04f (patch)
tree2e091e865bb03244e1d0313a56b79f1ee15cf892
parentb897cb1ec31f2404ecfdddf9da8ad2e106b72278 (diff)
downloadtor-dd98412ce122b84a01fb01e24068c9d7e95cb04f.tar.gz
tor-dd98412ce122b84a01fb01e24068c9d7e95cb04f.zip
allow servers to publish descriptors from 12 hours in the future.
hopefully this will allow more slack and let crummier servers help out too. svn:r4046
-rw-r--r--src/or/dirserv.c2
-rw-r--r--src/or/relay.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index d966fb1ca8..56bb0b21b1 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -12,7 +12,7 @@ const char dirserv_c_id[] = "$Id$";
**/
/** How far in the future do we allow a router to get? (seconds) */
-#define ROUTER_ALLOW_SKEW (30*60)
+#define ROUTER_ALLOW_SKEW (60*60*12) /* 12 hours */
/** How many seconds do we wait before regenerating the directory? */
#define DIR_REGEN_SLACK_TIME 10
diff --git a/src/or/relay.c b/src/or/relay.c
index 9ffb1eaa84..0340d5b2a6 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -748,7 +748,7 @@ connection_edge_process_relay_cell_not_open(
}
log_fn(LOG_WARN,"Got an unexpected relay command %d, in state %d (%s). Closing.",
- rh->command, conn->state, conn_state_to_string(conn->type, conn->state));
+ rh->command, conn->state, conn_state_to_string(conn->type, conn->state));
connection_edge_end(conn, END_STREAM_REASON_TORPROTOCOL, conn->cpath_layer);
connection_mark_for_close(conn);
return -1;