cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-12 05:48:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from ghazel/20_evdns_probe

Browse Source 
cancel the probe request when the server is freed, and ignore cancelled probe callbacks
This commit is contained in:
Nick Mathewson 2012-04-19 08:11:05 -07:00
commit 37c4fc8d0c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
evdns.c
View File

@ -2250,13 +2250,16 @@ nameserver_probe_callback(int result, char type, int count, int ttl, void *addre
(void) ttl; (void) ttl;
(void) addresses; (void) addresses;
EVDNS_LOCK(ns->base);
ns->probe_request = NULL;
if (result == DNS_ERR_CANCEL) { if (result == DNS_ERR_CANCEL) {
/* We canceled this request because the nameserver came up /* We canceled this request because the nameserver came up
* for some other reason. Do not change our opinion about * for some other reason. Do not change our opinion about
* the nameserver. */ * the nameserver. */
} else if (result == DNS_ERR_NONE || result == DNS_ERR_NOTEXIST) { return;
}
EVDNS_LOCK(ns->base);
ns->probe_request = NULL;
if (result == DNS_ERR_NONE || result == DNS_ERR_NOTEXIST) {
/* this is a good reply */ /* this is a good reply */
nameserver_up(ns); nameserver_up(ns);
} else { } else {
@ -2361,6 +2364,10 @@ evdns_base_clear_nameservers_and_suspend(struct evdns_base *base)
(void) event_del(&server->event); (void) event_del(&server->event);
if (evtimer_initialized(&server->timeout_event)) if (evtimer_initialized(&server->timeout_event))
(void) evtimer_del(&server->timeout_event); (void) evtimer_del(&server->timeout_event);
if (server->probe_request) {
evdns_cancel_request(server->base, server->probe_request);
server->probe_request = NULL;
}
if (server->socket >= 0) if (server->socket >= 0)
evutil_closesocket(server->socket); evutil_closesocket(server->socket);
mm_free(server); mm_free(server);