[or-cvs] fix arg bug; reduce confusion in package_raw_inbuf

Roger Dingledine arma at seul.org
Wed Mar 19 22:27:04 UTC 2003


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

Modified Files:
	connection.c 
Log Message:
fix arg bug; reduce confusion in package_raw_inbuf


Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- connection.c	19 Mar 2003 20:48:56 -0000	1.45
+++ connection.c	19 Mar 2003 22:27:01 -0000	1.46
@@ -399,7 +399,7 @@
    *
    * This check should may be different.
    */
-  if (connection_outbuf_too_full(conn->outbuf))
+  if (connection_outbuf_too_full(conn))
     return 0;
   
   n = decompress_buf_to_buf(
@@ -781,11 +781,8 @@
     }
     log(LOG_DEBUG,"connection_package_raw_inbuf(): receive_topicwindow at AP is %d",conn->p_receive_topicwindow);
   }
-  if (conn->inbuf_datalen) {
-    log(LOG_DEBUG,"connection_package_raw_inbuf(): recursing.");
-    goto repeat_connection_package_raw_inbuf;
-  }
-  return 0;
+  /* handle more if there's more, or return 0 if there isn't */
+  goto repeat_connection_package_raw_inbuf;
 }
 
 int connection_consider_sending_sendme(connection_t *conn, int edge_type) {



More information about the tor-commits mailing list