[or-cvs] Bring assert_connection_ok up to date

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	connection.c 
Log Message:
Bring assert_connection_ok up to date

Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- connection.c	18 Nov 2003 10:17:52 -0000	1.131
+++ connection.c	23 Nov 2003 18:14:19 -0000	1.132
@@ -717,8 +717,10 @@
    * marked_for_close. */
   
   /* buffers */
-  assert(conn->inbuf);
-  assert(conn->outbuf);
+  if (!connection_is_listener(conn)) {
+    assert(conn->inbuf);
+    assert(conn->outbuf);
+  }
 
   assert(!now || conn->timestamp_lastread <= now);
   assert(!now || conn->timestamp_lastwritten <= now);
@@ -788,12 +790,7 @@
     case CONN_TYPE_AP:
       assert(conn->state >= _AP_CONN_STATE_MIN &&
              conn->state <= _AP_CONN_STATE_MAX);
-      if (conn->state == AP_CONN_STATE_SOCKS_WAIT ||
-          conn->state == AP_CONN_STATE_CIRCUIT_WAIT) {
-        assert(conn->socks_request);
-      } else {
-        assert(!conn->socks_request);
-      }
+      assert(conn->socks_request);
       break;
     case CONN_TYPE_DIR:
       assert(conn->state >= _DIR_CONN_STATE_MIN &&