[or-cvs] reenable part of assert_circuit_ok, leave some still disabled

[Roger Dingledine]

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

Modified Files:
	circuit.c 
Log Message:
reenable part of assert_circuit_ok, leave some still disabled


Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- circuit.c	3 Mar 2004 02:24:17 -0000	1.148
+++ circuit.c	3 Mar 2004 04:11:18 -0000	1.149
@@ -1268,15 +1268,13 @@
 
   assert(c);
   assert(c->magic == CIRCUIT_MAGIC);
-  
-  return;
 
   if (c->n_conn)
     assert(c->n_conn->type == CONN_TYPE_OR);
   if (c->p_conn)
     assert(c->p_conn->type == CONN_TYPE_OR);
   for (conn = c->p_streams; conn; conn = conn->next_stream)
-    assert(c->p_conn->type == CONN_TYPE_AP);
+    assert(conn->type == CONN_TYPE_AP);
   for (conn = c->n_streams; conn; conn = conn->next_stream)
     assert(conn->type == CONN_TYPE_EXIT);
 
@@ -1296,7 +1294,7 @@
     }
   }
   if (c->cpath) {
-    assert_cpath_ok(c->cpath);
+//XXX    assert_cpath_ok(c->cpath);
   }
 }