[or-cvs] mark two more bugs. nick, can you take a look?

Roger Dingledine arma at seul.org
Tue Mar 29 05:27:34 UTC 2005


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 
Log Message:
mark two more bugs. nick, can you take a look?


Index: connection_edge.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- connection_edge.c	28 Mar 2005 02:03:51 -0000	1.312
+++ connection_edge.c	29 Mar 2005 05:27:32 -0000	1.313
@@ -34,6 +34,8 @@
     socks5_reply_status_t socksreason =
       connection_edge_end_reason_socks5_response(endreason);
 
+//XXX Bug: it's not marked for close yet, so the below things won't
+// be defined yet. -RD
     if (endreason == END_STREAM_REASON_ALREADY_SOCKS_REPLIED)
       log_fn(LOG_WARN,"Bug: stream (marked at %s:%d) sending two socks replies?",
              conn->marked_for_close_file, conn->marked_for_close);
@@ -44,6 +46,9 @@
       connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_ERROR,0,NULL);
   }
 
+//XXX Bug: this means that marked-for-close-file and marked-for-close
+// will all be defined as being inside this function. that's not what
+// we had in mind. -RD
   connection_mark_for_close(conn);
   conn->hold_open_until_flushed = 1;
 }



More information about the tor-commits mailing list