[or-cvs] oh hey. we were hanging up on every tor client because he

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	main.c 
Log Message:
oh hey. we were hanging up on every tor client because he
was obsolete as soon as he started. big oops.


Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.613
retrieving revision 1.614
diff -u -p -d -r1.613 -r1.614
--- main.c	11 Jan 2006 04:04:42 -0000	1.613
+++ main.c	11 Jan 2006 22:34:07 -0000	1.614
@@ -625,13 +625,16 @@ run_connection_housekeeping(int i, time_
            conn->address, conn->port, conn->s,
            (int)(now - conn->timestamp_created));
       conn->is_obsolete = 1;
-    } else if (connection_or_get_by_identity_digest(conn->identity_digest) !=
-               conn) {
-      info(LD_OR,
-           "Marking duplicate conn to %s:%d obsolete (fd %d, %d secs old).",
-           conn->address, conn->port, conn->s,
-           (int)(now - conn->timestamp_created));
-      conn->is_obsolete = 1;
+    } else {
+      connection_t *best =
+        connection_or_get_by_identity_digest(conn->identity_digest);
+      if (best && best != conn) {
+        info(LD_OR,
+             "Marking duplicate conn to %s:%d obsolete (fd %d, %d secs old).",
+             conn->address, conn->port, conn->s,
+             (int)(now - conn->timestamp_created));
+        conn->is_obsolete = 1;
+      }
     }
   }