summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-03-29 05:27:32 +0000
committerRoger Dingledine <arma@torproject.org>2005-03-29 05:27:32 +0000
commit5bdab005c9386090c5a55a42d8faf6d918f55f59 (patch)
tree26b680bbcc57967835f7f43ca2c6c792639e1328
parent20a8eda31b340740ec4865946d79c201ac9c7f48 (diff)
downloadtor-5bdab005c9386090c5a55a42d8faf6d918f55f59.tar.gz
tor-5bdab005c9386090c5a55a42d8faf6d918f55f59.zip
mark two more bugs. nick, can you take a look?
svn:r3920
-rw-r--r--src/or/connection_edge.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 1705637de9..d85e17b32d 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -34,6 +34,8 @@ connection_close_unattached_ap(connection_t *conn, int endreason) {
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_close_unattached_ap(connection_t *conn, int endreason) {
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;
}