[or-cvs] r10596: Oops; linked connections get read/write events too. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-13 17:05:32 -0400 (Wed, 13 Jun 2007)
New Revision: 10596

Modified:
   tor/trunk/
   tor/trunk/src/or/main.c
Log:
 r13406 at catbus:  nickm | 2007-06-13 17:05:30 -0400
 Oops; linked connections get read/write events too.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13406] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2007-06-13 20:37:19 UTC (rev 10595)
+++ tor/trunk/src/or/main.c	2007-06-13 21:05:32 UTC (rev 10596)
@@ -171,7 +171,7 @@
   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,