aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-06-13 21:05:32 +0000
committerNick Mathewson <nickm@torproject.org>2007-06-13 21:05:32 +0000
commitc2ea3e9aea5aa852c6778039ef107548f04c4cfc (patch)
treec5f5bf0fcfac2760966f8471f7d598200c6a39c7 /src/or/main.c
parent64626836699c4d1644ebf5f1df72e7f84c35be44 (diff)
downloadtor-c2ea3e9aea5aa852c6778039ef107548f04c4cfc.tar
tor-c2ea3e9aea5aa852c6778039ef107548f04c4cfc.tar.gz
r13406@catbus: nickm | 2007-06-13 17:05:30 -0400
Oops; linked connections get read/write events too. svn:r10596
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 5c7fcb547..14c242d20 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -171,7 +171,7 @@ connection_add(connection_t *conn)
conn->conn_array_index = smartlist_len(connection_array);
smartlist_add(connection_array, conn);
- if (conn->s >= 0) {
+ if (conn->s >= 0 || conn->linked) {
conn->read_event = tor_malloc_zero(sizeof(struct event));
conn->write_event = tor_malloc_zero(sizeof(struct event));
event_set(conn->read_event, conn->s, EV_READ|EV_PERSIST,