[or-cvs] remove archaic debugging aid that was probably unsafe

[arma@xxxxxxxx (Roger Dingledine)]

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

Modified Files:
	connection_edge.c or.h relay.c 
Log Message:
remove archaic debugging aid that was probably unsafe


Index: connection_edge.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- connection_edge.c	3 May 2005 10:04:07 -0000	1.322
+++ connection_edge.c	3 May 2005 10:17:38 -0000	1.323
@@ -76,7 +76,7 @@
     /* it still has stuff to process. don't let it die yet. */
     return 0;
   }
-  log_fn(LOG_INFO,"conn (fd %d) reached eof (stream size %d). Closing.", conn->s, (int)conn->stream_size);
+  log_fn(LOG_INFO,"conn (fd %d) reached eof. Closing.", conn->s);
   if (!conn->marked_for_close) {
     /* only mark it if not already marked. it's possible to
      * get the 'end' right around when the client hangs up on us. */

Index: or.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.603
retrieving revision 1.604
diff -u -d -r1.603 -r1.604
--- or.h	3 May 2005 10:04:08 -0000	1.603
+++ or.h	3 May 2005 10:17:38 -0000	1.604
@@ -614,7 +614,6 @@
                                            * querying for? (DIR/AP only) */
 
 /* Used only by edge connections: */
-  size_t stream_size; /**< Used for debugging. */
   uint16_t stream_id;
   struct connection_t *next_stream; /**< Points to the next stream at this
                                      * edge, if any (Edge only). */

Index: relay.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- relay.c	3 May 2005 10:04:08 -0000	1.67
+++ relay.c	3 May 2005 10:17:38 -0000	1.68
@@ -827,10 +827,6 @@
       }
 
       stats_n_data_bytes_received += rh.length;
-      if (conn->type == CONN_TYPE_AP) {
-        conn->stream_size += rh.length;
-        log_fn(LOG_DEBUG,"%d: stream size now %d.", conn->s, (int)conn->stream_size);
-      }
       connection_write_to_buf(cell->payload + RELAY_HEADER_SIZE,
                               rh.length, conn);
       connection_edge_consider_sending_sendme(conn);
@@ -843,11 +839,11 @@
         return 0;
       }
 /* XXX add to this log_fn the exit node's nickname? */
-      log_fn(LOG_INFO,"%d: end cell (%s) for stream %d. Removing stream. Size %d.",
+      log_fn(LOG_INFO,"%d: end cell (%s) for stream %d. Removing stream.",
              conn->s,
              connection_edge_end_reason_str(rh.length > 0 ?
                *(char *)(cell->payload+RELAY_HEADER_SIZE) : -1),
-             conn->stream_id, (int)conn->stream_size);
+             conn->stream_id);
       if (conn->socks_request && !conn->socks_request->has_finished)
         log_fn(LOG_WARN,"Bug: open stream hasn't sent socks answer yet? Closing.");
 #ifdef HALF_OPEN
@@ -1044,10 +1040,6 @@
 
   log_fn(LOG_DEBUG,"(%d) Packaging %d bytes (%d waiting).", conn->s,
          (int)length, (int)buf_datalen(conn->inbuf));
-  if (conn->type == CONN_TYPE_EXIT) {
-    conn->stream_size += length;
-    log_fn(LOG_DEBUG,"%d: Stream size now %d.", conn->s, (int)conn->stream_size);
-  }
 
   if (connection_edge_send_command(conn, circ, RELAY_COMMAND_DATA,
                                    payload, length, conn->cpath_layer) < 0)