aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2003-02-28 23:49:52 +0000
committerRoger Dingledine <arma@torproject.org>2003-02-28 23:49:52 +0000
commitc5e7d4ca7aabb848eb2a5502c93798b8a6e04b93 (patch)
tree77b1d4307915e5f54d32d82bb3239e9b0239f072 /src/or/connection.c
parent7461959371d358dccbd00544aa323f1f05cc77cd (diff)
downloadtor-c5e7d4ca7aabb848eb2a5502c93798b8a6e04b93.tar
tor-c5e7d4ca7aabb848eb2a5502c93798b8a6e04b93.tar.gz
when we had multiple conns on a circuit, we'd tell the wrong
one to stop reading svn:r163
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 0e7847a64..4c4975257 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -615,7 +615,7 @@ repeat_connection_package_raw_inbuf:
return -1;
}
- log(LOG_DEBUG,"connection_package_raw_inbuf(): Packaging %d bytes (%d waiting).",cell.length, amount_to_process);
+ log(LOG_DEBUG,"connection_package_raw_inbuf(): (%d) Packaging %d bytes (%d waiting).",conn->s,cell.length, amount_to_process);
*(uint16_t *)(cell.payload+2) = htons(conn->topic_id);
*cell.payload = TOPIC_COMMAND_DATA;
@@ -631,7 +631,7 @@ repeat_connection_package_raw_inbuf:
}
assert(conn->n_receive_topicwindow > 0);
if(--conn->n_receive_topicwindow <= 0) { /* is it 0 after decrement? */
- connection_stop_reading(circ->n_conn);
+ connection_stop_reading(conn);
log(LOG_DEBUG,"connection_package_raw_inbuf(): receive_topicwindow at exit reached 0.");
return 0; /* don't process the inbuf any more */
}
@@ -646,7 +646,7 @@ repeat_connection_package_raw_inbuf:
}
assert(conn->p_receive_topicwindow > 0);
if(--conn->p_receive_topicwindow <= 0) { /* is it 0 after decrement? */
- connection_stop_reading(circ->p_conn);
+ connection_stop_reading(conn);
log(LOG_DEBUG,"connection_package_raw_inbuf(): receive_topicwindow at AP reached 0.");
return 0; /* don't process the inbuf any more */
}