aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-04-08 03:30:47 +0000
committerRoger Dingledine <arma@torproject.org>2004-04-08 03:30:47 +0000
commit299df7117c54f114ebc4775b9ad18ea09a39c4b5 (patch)
treec91b054d6def2ac81dcb2230b4579bee5f9acfcb /src/or
parentede1d3e42d0ba2503ef4d61eb1f1c18c6784b3a5 (diff)
downloadtor-299df7117c54f114ebc4775b9ad18ea09a39c4b5.tar
tor-299df7117c54f114ebc4775b9ad18ea09a39c4b5.tar.gz
don't try to circuit_log_path if you're at the exit edge of a circ
svn:r1561
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection_edge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 00d4735a1..9f3c0aae1 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -237,9 +237,10 @@ int connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
if(conn && conn->state != AP_CONN_STATE_OPEN && conn->state != EXIT_CONN_STATE_OPEN) {
if(rh.command == RELAY_COMMAND_END) {
- circuit_log_path(LOG_INFO,circ);
log_fn(LOG_INFO,"Edge got end (%s) before we're connected. Marking for close.",
connection_edge_end_reason(cell->payload+RELAY_HEADER_SIZE, rh.length));
+ if(CIRCUIT_IS_ORIGIN(circ))
+ circuit_log_path(LOG_INFO,circ);
conn->has_sent_end = 1; /* we just got an 'end', don't need to send one */
connection_mark_for_close(conn, 0);
/* XXX This is where we should check if reason is EXITPOLICY, and reattach */