[or-cvs] Use EXIT properly in assert_connection_ok

[nickm@seul.org (Nick Mathewson)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv8731/src/or

Modified Files:
	connection.c 
Log Message:
Use EXIT properly in assert_connection_ok

Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- connection.c	16 Sep 2003 19:36:19 -0000	1.94
+++ connection.c	16 Sep 2003 19:51:09 -0000	1.95
@@ -808,7 +808,7 @@
 #endif
   }
   
-  if (conn->type != CONN_TYPE_EXIT) {
+  if (conn->type != CONN_TYPE_EXIT && conn->type != CONN_TYPE_AP) {
     assert(!conn->stream_id[0]);
     assert(!conn->next_stream);
     assert(!conn->cpath_layer);
@@ -818,7 +818,8 @@
     assert(!conn->done_receiving);
   } else {
     assert(!conn->next_stream || 
-           conn->next_stream->type == CONN_TYPE_EXIT);
+           conn->next_stream->type == CONN_TYPE_EXIT ||
+           conn->next_stream->type == CONN_TYPE_AP);
     assert(conn->cpath_layer);
     assert_cpath_layer_ok(conn->cpath_layer);
     /* XXX unchecked, package window, deliver window. */
@@ -847,7 +848,7 @@
              conn->state <= _EXIT_CONN_STATE_MAX);
       break;
     case CONN_TYPE_AP:
-      assert(conn->state >= _AP_CONN_STATE_MIN &&
+      assert(conn->state >= _EXIT_CONN_STATE_MIN &&
              conn->state <= _AP_CONN_STATE_MAX);
       break;
     case CONN_TYPE_DIR: