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

Merge commit 'origin/maint-0.2.1'

Browse Source
This commit is contained in:
Nick Mathewson 2009-05-18 16:17:12 -04:00
commit 79762aac17
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -43,6 +43,8 @@ Changes in version 0.2.1.15??? - ????-??-??
descriptor as never-downloadable. Bugfix on 0.2.1.9-alpha. descriptor as never-downloadable. Bugfix on 0.2.1.9-alpha.
- Fix a memory leak when v3 directory authorities load their keys - Fix a memory leak when v3 directory authorities load their keys
and cert from disk. Bugfix on 0.2.0.1-alpha. and cert from disk. Bugfix on 0.2.0.1-alpha.
- Add a test and fix for a possible cause of bug 957. If it's
the real cause, it should display some warning messages.
Changes in version 0.2.1.14-rc - 2009-04-12 Changes in version 0.2.1.14-rc - 2009-04-12

25
src/or/eventdns.c
View File

@ -490,7 +490,7 @@ _del_timeout_event(u16 *lineno, struct event *ev, int line)
{ {
if (*lineno) { if (*lineno) {
log(EVDNS_LOG_WARN, log(EVDNS_LOG_WARN,
"Duplicate timeout event_del from line %d: first call " "BUG: Duplicate timeout event_del from line %d: first call "
"was at %d.", line, (int)*lineno); "was at %d.", line, (int)*lineno);
return 0; return 0;
} else { } else {
@ -501,6 +501,24 @@ _del_timeout_event(u16 *lineno, struct event *ev, int line)
#define del_timeout_event(s) \ #define del_timeout_event(s) \
(_del_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, \ (_del_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, \
__LINE__)) __LINE__))
/* For debugging bug 929/957. XXXX021 */
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 "
"was actually added on line %d",
line, (int)*lineno);
*lineno = line;
return event_del(ev);
}
return 0;
}
#define del_timeout_event_if_set(s) \
_del_timeout_event_if_set(&(s)->timeout_event_deleted, \
&(s)->timeout_event, \
__LINE__)
/* This walks the list of inflight requests to find the */ /* This walks the list of inflight requests to find the */
/* one with a matching transaction id. Returns NULL on */ /* one with a matching transaction id. Returns NULL on */
@ -549,6 +567,7 @@ nameserver_probe_failed(struct nameserver *const ns) {
global_nameserver_timeouts_length - 1)]; global_nameserver_timeouts_length - 1)];
ns->failed_times++; ns->failed_times++;
del_timeout_event_if_set(ns);
evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns); evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
if (add_timeout_event(ns, (struct timeval *) timeout) < 0) { if (add_timeout_event(ns, (struct timeval *) timeout) < 0) {
log(EVDNS_LOG_WARN, log(EVDNS_LOG_WARN,
@ -578,6 +597,7 @@ nameserver_failed(struct nameserver *const ns, const char *msg) {
ns->state = 0; ns->state = 0;
ns->failed_times = 1; ns->failed_times = 1;
del_timeout_event_if_set(ns);
evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns); evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
if (add_timeout_event(ns, (struct timeval *) &global_nameserver_timeouts[0]) < 0) { if (add_timeout_event(ns, (struct timeval *) &global_nameserver_timeouts[0]) < 0) {
log(EVDNS_LOG_WARN, log(EVDNS_LOG_WARN,
@ -2089,6 +2109,7 @@ evdns_request_transmit(struct evdns_request *req) {
/* transmitted; we need to check for timeout. */ /* transmitted; we need to check for timeout. */
log(EVDNS_LOG_DEBUG, log(EVDNS_LOG_DEBUG,
"Setting timeout for request %lx", (unsigned long) req); "Setting timeout for request %lx", (unsigned long) req);
del_timeout_event_if_set(req);
evtimer_set(&req->timeout_event, evdns_request_timeout_callback, req); evtimer_set(&req->timeout_event, evdns_request_timeout_callback, req);
if (add_timeout_event(req, &global_timeout) < 0) { if (add_timeout_event(req, &global_timeout) < 0) {
log(EVDNS_LOG_WARN, log(EVDNS_LOG_WARN,
@ -2297,6 +2318,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address,
if (!ns) return -1; if (!ns) return -1;
memset(ns, 0, sizeof(struct nameserver)); memset(ns, 0, sizeof(struct nameserver));
ns->timeout_event_deleted = __LINE__;
ns->socket = socket(PF_INET, SOCK_DGRAM, 0); ns->socket = socket(PF_INET, SOCK_DGRAM, 0);
if (ns->socket < 0) { err = 1; goto out1; } if (ns->socket < 0) { err = 1; goto out1; }
@ -2531,6 +2553,7 @@ request_new(int type, const char *name, int flags,
} }
memset(req, 0, sizeof(struct evdns_request)); memset(req, 0, sizeof(struct evdns_request));
req->timeout_event_deleted = __LINE__;
if (global_randomize_case) { if (global_randomize_case) {
unsigned i; unsigned i;