summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-04-06 15:19:32 +0000
committerRoger Dingledine <arma@torproject.org>2005-04-06 15:19:32 +0000
commit9cbaf4603d56a521b9d6e82489cd5aea624a395b (patch)
tree2f16eecbcba87929a4910556c4c04f5b85919aae /src/or/main.c
parent88dc243bb53d8e3a320d04ce525452e692df4fb6 (diff)
downloadtor-9cbaf4603d56a521b9d6e82489cd5aea624a395b.tar.gz
tor-9cbaf4603d56a521b9d6e82489cd5aea624a395b.zip
fix an assert trigger: when we have the rare case of accepting
a conn on 0.0.0.0:0, then when we look through the connection array, we'll find any of the workers. this is no good. svn:r4027
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/or/main.c b/src/or/main.c
index ec07e0fcce..e4d1d24398 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -838,17 +838,6 @@ static void second_elapsed_callback(int fd, short event, void *args)
current_second = now.tv_sec; /* remember which second it is, for next time */
-#if 0
- for (i=0;i<nfds;i++) {
- conn = connection_array[i];
- if (connection_has_pending_tls_data(conn) &&
- connection_is_reading(conn)) {
- log_fn(LOG_DEBUG,"sock %d has pending bytes.",conn->s);
- return; /* has pending bytes to read; don't let poll wait. */
- }
- }
-#endif
-
if (evtimer_add(timeout_event, &one_second))
log_fn(LOG_ERR,
"Error from libevent when setting one-second timeout event");