[or-cvs] Move connection_or_remove_from_identity_map() to connection...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv21225/src/or

Modified Files:
	connection.c main.c 
Log Message:
Move connection_or_remove_from_identity_map() to connection_unlink, but dont remove the other; just make it warn.

Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- connection.c	30 Nov 2005 03:01:16 -0000	1.423
+++ connection.c	30 Nov 2005 04:28:41 -0000	1.424
@@ -238,6 +238,7 @@
   }
 
   if (conn->type == CONN_TYPE_OR && !tor_digest_is_zero(conn->identity_digest)) {
+    warn(LD_BUG, "called on OR conn with non-zeroed idenity_digest");
     connection_or_remove_from_identity_map(conn);
   }
 

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -d -r1.595 -r1.596
--- main.c	26 Nov 2005 09:37:00 -0000	1.595
+++ main.c	30 Nov 2005 04:28:41 -0000	1.596
@@ -198,6 +198,9 @@
   if (conn->type == CONN_TYPE_EXIT) {
     assert_connection_edge_not_dns_pending(conn);
   }
+  if (conn->type == CONN_TYPE_OR && !tor_digest_is_zero(conn->identity_digest)) {
+    connection_or_remove_from_identity_map(conn);
+  }
   connection_free(conn);
 }