diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2015-05-15 10:23:51 +0200 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2015-05-15 10:23:51 +0200 |
| commit | 02013228914a1d17e8df15d4e2b7950469395a5c (patch) | |
| tree | 48d2fbe2f5a5adb60cbeabc26fadaec8e0fa82ed /libevent-2.0.20-stable | |
| parent | 9b3dbb454e8f8a463d5fe4541ee2001585527bc6 (diff) | |
ripe-atlas-fw: imported version 45204520
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Diffstat (limited to 'libevent-2.0.20-stable')
| -rwxr-xr-x | libevent-2.0.20-stable/configure | 2 | ||||
| -rw-r--r-- | libevent-2.0.20-stable/evdns.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libevent-2.0.20-stable/configure b/libevent-2.0.20-stable/configure index d2bd3cb..af5ad31 100755 --- a/libevent-2.0.20-stable/configure +++ b/libevent-2.0.20-stable/configure @@ -555,7 +555,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` # # Initializations. # -ac_default_prefix=/usr/local +ac_default_prefix=/usr/local/atlas ac_clean_files= ac_config_libobj_dir=. LIBOBJS= diff --git a/libevent-2.0.20-stable/evdns.c b/libevent-2.0.20-stable/evdns.c index e9cea45..8beee70 100644 --- a/libevent-2.0.20-stable/evdns.c +++ b/libevent-2.0.20-stable/evdns.c @@ -408,6 +408,7 @@ static int evdns_base_resolv_conf_parse_impl(struct evdns_base *base, int flags, static int evdns_base_set_option_impl(struct evdns_base *base, const char *option, const char *val, int flags); static void evdns_base_free_and_unlock(struct evdns_base *base, int fail_requests); +static void evdns_request_timeout_callback(evutil_socket_t fd, short events, void *arg); static int strtoint(const char *const str); @@ -894,7 +895,9 @@ reply_handle(struct request *const req, u16 flags, u32 ttl, struct reply *reply) evutil_format_sockaddr_port( (struct sockaddr *)&req->ns->address, addrbuf, sizeof(addrbuf))); - break; + /* Call the timneout function */ + evdns_request_timeout_callback(0, 0, req); + return; default: /* we got a good reply from the nameserver: it is up. */ if (req->handle == req->ns->probe_request) { |