diff options
author | Nick Mathewson <nickm@torproject.org> | 2009-05-22 11:47:09 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2009-05-22 11:47:09 -0400 |
commit | 1d002a25a261237e4ad1e3d9f3701670be853e6f (patch) | |
tree | 09b705c7ecd7016fbeb7e8a5f269fd33b4cbecc0 /src/or | |
parent | 678092750b95fe60b1eef638992f60cb028a8643 (diff) | |
download | tor-1d002a25a261237e4ad1e3d9f3701670be853e6f.tar.gz tor-1d002a25a261237e4ad1e3d9f3701670be853e6f.zip |
Finish up the 0.2.1 version of the bug 957 fix.
Basically, all this means is downgrading our warning messages to debug
messages, since the bug workaround code here is adequate to stop the
bug.
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/eventdns.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 4958b9ae30..cd1330314b 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -474,7 +474,7 @@ sockaddr_eq(const struct sockaddr *sa1, const struct sockaddr *sa2, return 1; } -/* for debugging bug 929. XXXX021 */ +/* for debugging bug 929. XXXX022 */ static int _add_timeout_event(u16 *lineno, struct event *ev, struct timeval *to) { @@ -484,13 +484,13 @@ _add_timeout_event(u16 *lineno, struct event *ev, struct timeval *to) #define add_timeout_event(s, to) \ (_add_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, (to))) -/* for debugging bug 929. XXXX021 */ +/* for debugging bug 929. XXXX022 */ static int _del_timeout_event(u16 *lineno, struct event *ev, int line) { if (*lineno) { - log(EVDNS_LOG_WARN, - "BUG: Duplicate timeout event_del from line %d: first call " + log(EVDNS_LOG_DEBUG, + "Duplicate timeout event_del from line %d: first call " "was at %d.", line, (int)*lineno); return 0; } else { @@ -501,13 +501,13 @@ _del_timeout_event(u16 *lineno, struct event *ev, int line) #define del_timeout_event(s) \ (_del_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, \ __LINE__)) -/* For debugging bug 929/957. XXXX021 */ +/* For debugging bug 929/957. XXXX022 */ static int _del_timeout_event_if_set(u16 *lineno, struct event *ev, int line) { if (*lineno == 0) { - log(EVDNS_LOG_WARN, - "BUG: Event that I thought was non-added as of line %d " + log(EVDNS_LOG_DEBUG, + "Event that I thought was non-added as of line %d " "was actually added on line %d", line, (int)*lineno); *lineno = line; |