nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable warning for marked-but-reading in main.c

Browse Source 
It turns out this can happen.  Even though there is no reason for
connections to be marked but reading, we leave them reading anyway,
so warning here is unwarranted.  Let's turn that back on once we do
something sensible and disable reading when we mark.  Bugfix for
6203 on Tor 0.2.3.17-beta.

Thanks to cypherpunks for pointing out the general stupidity of the
original code here.
This commit is contained in:
Nick Mathewson 2012-06-19 11:48:03 -04:00
parent e6782b355a
commit 0600e8cab1
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug6203 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Disable a spurious warning about reading on a marked and flushing
connection. We shouldn't be doing that, but apparently we
sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta.

13
src/or/main.c
View File

@ -848,7 +848,10 @@ conn_close_if_marked(int i)
"Holding conn (fd %d) open for more flushing.", "Holding conn (fd %d) open for more flushing.",
(int)conn->s)); (int)conn->s));
conn->timestamp_lastwritten = now; /* reset so we can flush more */ conn->timestamp_lastwritten = now; /* reset so we can flush more */
} else if (sz == 0) { /* retval is also 0 */ } else if (sz == 0) {
/* Also, retval==0. If we get here, we didn't want to write anything
* (because of rate-limiting) and we didn't. */
/* Connection must flush before closing, but it's being rate-limited. /* Connection must flush before closing, but it's being rate-limited.
* Let's remove from Libevent, and mark it as blocked on bandwidth * Let's remove from Libevent, and mark it as blocked on bandwidth
* so it will be re-added on next token bucket refill. Prevents * so it will be re-added on next token bucket refill. Prevents
@ -860,6 +863,13 @@ conn_close_if_marked(int i)
connection_stop_writing(conn); connection_stop_writing(conn);
} }
if (connection_is_reading(conn)) { if (connection_is_reading(conn)) {
/* XXXX024 We should make this code unreachable; if a connection is
* marked for close and flushing, there is no point in reading to it
* at all. Further, checking at this point is a bit of a hack: it
* would make much more sense to react in
* connection_handle_read_impl, or to just stop reading in
* mark_and_flush */
#if 0
#define MARKED_READING_RATE 180 #define MARKED_READING_RATE 180
static ratelim_t marked_read_lim = RATELIM_INIT(MARKED_READING_RATE); static ratelim_t marked_read_lim = RATELIM_INIT(MARKED_READING_RATE);
char *m; char *m;
@ -870,6 +880,7 @@ conn_close_if_marked(int i)
conn_state_to_string(conn->type, conn->state), m); conn_state_to_string(conn->type, conn->state), m);
tor_free(m); tor_free(m);
} }
#endif
conn->read_blocked_on_bw = 1; conn->read_blocked_on_bw = 1;
connection_stop_reading(conn); connection_stop_reading(conn);
} }