From 83a0c9c65a60a92d3ea5542596b3ba56db492c37 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Thu, 10 Aug 2017 12:30:25 -0700 Subject: Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?" This reverts commits 2a572d125a91a4aafd3ad8ce87259fc640fa0763 and af241a5c8c2cde0fab7d7d563276c1095b00e3b4, which break tombstoned. Bug: http://b/64543673 Test: manual + treehugger --- evdns.c | 452 ++++++++++++++++++++++++++-------------------------------------- 1 file changed, 180 insertions(+), 272 deletions(-) (limited to 'evdns.c') diff --git a/evdns.c b/evdns.c index e9dbc35..60b1048 100644 --- a/evdns.c +++ b/evdns.c @@ -48,10 +48,8 @@ * Version: 0.1b */ -#include "event2/event-config.h" -#include "evconfig-private.h" - #include +#include "event2/event-config.h" #ifndef _FORTIFY_SOURCE #define _FORTIFY_SOURCE 3 @@ -59,23 +57,23 @@ #include #include -#ifdef EVENT__HAVE_SYS_TIME_H +#ifdef _EVENT_HAVE_SYS_TIME_H #include #endif -#ifdef EVENT__HAVE_STDINT_H +#ifdef _EVENT_HAVE_STDINT_H #include #endif #include #include #include -#ifdef EVENT__HAVE_UNISTD_H +#ifdef _EVENT_HAVE_UNISTD_H #include #endif #include #include #include #include -#ifdef _WIN32 +#ifdef WIN32 #include #include #ifndef _WIN32_IE @@ -92,6 +90,10 @@ #include "event2/event_struct.h" #include "event2/thread.h" +#include "event2/bufferevent.h" +#include "event2/bufferevent_struct.h" +#include "bufferevent-internal.h" + #include "defer-internal.h" #include "log-internal.h" #include "mm-internal.h" @@ -99,7 +101,7 @@ #include "ipv6-internal.h" #include "util-internal.h" #include "evthread-internal.h" -#ifdef _WIN32 +#ifdef WIN32 #include #include #include @@ -111,13 +113,13 @@ #include #endif -#ifdef EVENT__HAVE_NETINET_IN6_H +#ifdef _EVENT_HAVE_NETINET_IN6_H #include #endif -#define EVDNS_LOG_DEBUG EVENT_LOG_DEBUG -#define EVDNS_LOG_WARN EVENT_LOG_WARN -#define EVDNS_LOG_MSG EVENT_LOG_MSG +#define EVDNS_LOG_DEBUG 0 +#define EVDNS_LOG_WARN 1 +#define EVDNS_LOG_MSG 2 #ifndef HOST_NAME_MAX #define HOST_NAME_MAX 255 @@ -232,10 +234,6 @@ struct nameserver { char choked; /* true if we have an EAGAIN from this server's socket */ char write_waiting; /* true if we are waiting for EV_WRITE events */ struct evdns_base *base; - - /* Number of currently inflight requests: used - * to track when we should add/del the event. */ - int requests_inflight; }; @@ -253,7 +251,7 @@ struct evdns_server_port { struct server_request *pending_replies; struct event_base *event_base; -#ifndef EVENT__DISABLE_THREAD_SUPPORT +#ifndef _EVENT_DISABLE_THREAD_SUPPORT void *lock; #endif }; @@ -355,11 +353,9 @@ struct evdns_base { TAILQ_HEAD(hosts_list, hosts_entry) hostsdb; -#ifndef EVENT__DISABLE_THREAD_SUPPORT +#ifndef _EVENT_DISABLE_THREAD_SUPPORT void *lock; #endif - - int disable_when_inactive; }; struct hosts_entry { @@ -412,14 +408,13 @@ 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); -#ifdef EVENT__DISABLE_THREAD_SUPPORT -#define EVDNS_LOCK(base) EVUTIL_NIL_STMT_ -#define EVDNS_UNLOCK(base) EVUTIL_NIL_STMT_ -#define ASSERT_LOCKED(base) EVUTIL_NIL_STMT_ +#ifdef _EVENT_DISABLE_THREAD_SUPPORT +#define EVDNS_LOCK(base) _EVUTIL_NIL_STMT +#define EVDNS_UNLOCK(base) _EVUTIL_NIL_STMT +#define ASSERT_LOCKED(base) _EVUTIL_NIL_STMT #else #define EVDNS_LOCK(base) \ EVLOCK_LOCK((base)->lock, 0) @@ -429,6 +424,17 @@ static int strtoint(const char *const str); EVLOCK_ASSERT_LOCKED((base)->lock) #endif +static void +default_evdns_log_fn(int warning, const char *buf) +{ + if (warning == EVDNS_LOG_WARN) + event_warnx("[evdns] %s", buf); + else if (warning == EVDNS_LOG_MSG) + event_msgx("[evdns] %s", buf); + else + event_debug(("[evdns] %s", buf)); +} + static evdns_debug_log_fn_type evdns_log_fn = NULL; void @@ -443,24 +449,28 @@ evdns_set_log_fn(evdns_debug_log_fn_type fn) #define EVDNS_LOG_CHECK #endif -static void evdns_log_(int severity, const char *fmt, ...) EVDNS_LOG_CHECK; +static void _evdns_log(int warn, const char *fmt, ...) EVDNS_LOG_CHECK; static void -evdns_log_(int severity, const char *fmt, ...) +_evdns_log(int warn, const char *fmt, ...) { va_list args; + char buf[512]; + if (!evdns_log_fn) + return; va_start(args,fmt); + evutil_vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); if (evdns_log_fn) { - char buf[512]; - int is_warn = (severity == EVDNS_LOG_WARN); - evutil_vsnprintf(buf, sizeof(buf), fmt, args); - evdns_log_fn(is_warn, buf); + if (warn == EVDNS_LOG_MSG) + warn = EVDNS_LOG_WARN; + evdns_log_fn(warn, buf); } else { - event_logv_(severity, NULL, fmt, args); + default_evdns_log_fn(warn, buf); } - va_end(args); + } -#define log evdns_log_ +#define log _evdns_log /* This walks the list of inflight requests to find the */ /* one with a matching transaction id. Returns NULL on */ @@ -535,23 +545,12 @@ nameserver_probe_failed(struct nameserver *const ns) { char addrbuf[128]; log(EVDNS_LOG_WARN, "Error from libevent when adding timer event for %s", - evutil_format_sockaddr_port_( + evutil_format_sockaddr_port( (struct sockaddr *)&ns->address, addrbuf, sizeof(addrbuf))); } } -static void -request_swap_ns(struct request *req, struct nameserver *ns) { - if (ns && req->ns != ns) { - EVUTIL_ASSERT(req->ns->requests_inflight > 0); - req->ns->requests_inflight--; - ns->requests_inflight++; - - req->ns = ns; - } -} - /* called when a nameserver has been deemed to have failed. For example, too */ /* many packets have timed out etc */ static void @@ -567,7 +566,7 @@ nameserver_failed(struct nameserver *const ns, const char *msg) { if (!ns->state) return; log(EVDNS_LOG_MSG, "Nameserver %s has failed: %s", - evutil_format_sockaddr_port_( + evutil_format_sockaddr_port( (struct sockaddr *)&ns->address, addrbuf, sizeof(addrbuf)), msg); @@ -585,7 +584,7 @@ nameserver_failed(struct nameserver *const ns, const char *msg) { &base->global_nameserver_probe_initial_timeout) < 0) { log(EVDNS_LOG_WARN, "Error from libevent when adding timer event for %s", - evutil_format_sockaddr_port_( + evutil_format_sockaddr_port( (struct sockaddr *)&ns->address, addrbuf, sizeof(addrbuf))); /* ???? Do more? */ @@ -606,7 +605,7 @@ nameserver_failed(struct nameserver *const ns, const char *msg) { if (req->tx_count == 0 && req->ns == ns) { /* still waiting to go out, can be moved */ /* to another server */ - request_swap_ns(req, nameserver_pick(base)); + req->ns = nameserver_pick(base); } req = req->next; } while (req != started_at); @@ -621,7 +620,7 @@ nameserver_up(struct nameserver *const ns) ASSERT_LOCKED(ns->base); if (ns->state) return; log(EVDNS_LOG_MSG, "Nameserver %s is back up", - evutil_format_sockaddr_port_( + evutil_format_sockaddr_port( (struct sockaddr *)&ns->address, addrbuf, sizeof(addrbuf))); evtimer_del(&ns->timeout_event); @@ -659,20 +658,12 @@ request_finished(struct request *const req, struct request **head, int free_hand if (was_inflight) { evtimer_del(&req->timeout_event); base->global_requests_inflight--; - req->ns->requests_inflight--; } else { base->global_requests_waiting--; } /* it was initialized during request_new / evtimer_assign */ event_debug_unassign(&req->timeout_event); - if (req->ns && - req->ns->requests_inflight == 0 && - req->base->disable_when_inactive) { - event_del(&req->ns->event); - evtimer_del(&req->ns->timeout_event); - } - if (!req->request_appended) { /* need to free the request data on it's own */ mm_free(req->request); @@ -719,7 +710,7 @@ request_reissue(struct request *req) { /* the last nameserver should have been marked as failing */ /* by the caller of this function, therefore pick will try */ /* not to return it */ - request_swap_ns(req, nameserver_pick(req->base)); + req->ns = nameserver_pick(req->base); if (req->ns == last_ns) { /* ... but pick did return it */ /* not a lot of point in trying again with the */ @@ -754,8 +745,6 @@ evdns_requests_pump_waiting_queue(struct evdns_base *base) { return; /* move a request from the waiting queue to the inflight queue */ - req->ns->requests_inflight++; - evdns_request_remove(req, &base->req_waiting_head); base->global_requests_waiting--; @@ -771,7 +760,7 @@ evdns_requests_pump_waiting_queue(struct evdns_base *base) { /* TODO(nickm) document */ struct deferred_reply_callback { - struct event_callback deferred; + struct deferred_cb deferred; struct evdns_request *handle; u8 request_type; u8 have_reply; @@ -782,7 +771,7 @@ struct deferred_reply_callback { }; static void -reply_run_callback(struct event_callback *d, void *user_pointer) +reply_run_callback(struct deferred_cb *d, void *user_pointer) { struct deferred_reply_callback *cb = EVUTIL_UPCAST(d, struct deferred_reply_callback, deferred); @@ -853,13 +842,10 @@ reply_schedule_callback(struct request *const req, u32 ttl, u32 err, struct repl d->handle = req->handle; } - event_deferred_cb_init_( - &d->deferred, - event_get_priority(&req->timeout_event), - reply_run_callback, + event_deferred_cb_init(&d->deferred, reply_run_callback, req->user_pointer); - event_deferred_cb_schedule_( - req->base->event_base, + event_deferred_cb_schedule( + event_base_get_deferred_cb_queue(req->base->event_base), &d->deferred); } @@ -913,12 +899,10 @@ reply_handle(struct request *const req, u16 flags, u32 ttl, struct reply *reply) */ log(EVDNS_LOG_DEBUG, "Got a SERVERFAILED from nameserver" "at %s; will allow the request to time out.", - evutil_format_sockaddr_port_( + evutil_format_sockaddr_port( (struct sockaddr *)&req->ns->address, addrbuf, sizeof(addrbuf))); - /* Call the timeout function */ - evdns_request_timeout_callback(0, 0, req); - return; + break; default: /* we got a good reply from the nameserver: it is up. */ if (req->handle == req->ns->probe_request) { @@ -961,8 +945,8 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) { int name_end = -1; int j = *idx; int ptr_count = 0; -#define GET32(x) do { if (j + 4 > length) goto err; memcpy(&t32_, packet + j, 4); j += 4; x = ntohl(t32_); } while (0) -#define GET16(x) do { if (j + 2 > length) goto err; memcpy(&t_, packet + j, 2); j += 2; x = ntohs(t_); } while (0) +#define GET32(x) do { if (j + 4 > length) goto err; memcpy(&_t32, packet + j, 4); j += 4; x = ntohl(_t32); } while (0) +#define GET16(x) do { if (j + 2 > length) goto err; memcpy(&_t, packet + j, 2); j += 2; x = ntohs(_t); } while (0) #define GET8(x) do { if (j >= length) goto err; x = packet[j++]; } while (0) char *cp = name_out; @@ -976,6 +960,7 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) { for (;;) { u8 label_len; + if (j >= length) return -1; GET8(label_len); if (!label_len) break; if (label_len & 0xc0) { @@ -996,7 +981,6 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) { *cp++ = '.'; } if (cp + label_len >= end) return -1; - if (j + label_len > length) return -1; memcpy(cp, packet + j, label_len); cp += label_len; j += label_len; @@ -1016,8 +1000,8 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) { static int reply_parse(struct evdns_base *base, u8 *packet, int length) { int j = 0, k = 0; /* index into packet */ - u16 t_; /* used by the macros */ - u32 t32_; /* used by the macros */ + u16 _t; /* used by the macros */ + u32 _t32; /* used by the macros */ char tmp_name[256], cmp_name[256]; /* used by the macros */ int name_matches = 0; @@ -1060,6 +1044,24 @@ reply_parse(struct evdns_base *base, u8 *packet, int length) { sizeof(tmp_name))<0) \ goto err; \ } while (0) +#define TEST_NAME \ + do { tmp_name[0] = '\0'; \ + cmp_name[0] = '\0'; \ + k = j; \ + if (name_parse(packet, length, &j, tmp_name, \ + sizeof(tmp_name))<0) \ + goto err; \ + if (name_parse(req->request, req->request_len, &k, \ + cmp_name, sizeof(cmp_name))<0) \ + goto err; \ + if (base->global_randomize_case) { \ + if (strcmp(tmp_name, cmp_name) == 0) \ + name_matches = 1; \ + } else { \ + if (evutil_ascii_strcasecmp(tmp_name, cmp_name) == 0) \ + name_matches = 1; \ + } \ + } while (0) reply.type = req->request_type; @@ -1068,25 +1070,9 @@ reply_parse(struct evdns_base *base, u8 *packet, int length) { /* the question looks like * */ - tmp_name[0] = '\0'; - cmp_name[0] = '\0'; - k = j; - if (name_parse(packet, length, &j, tmp_name, sizeof(tmp_name)) < 0) - goto err; - if (name_parse(req->request, req->request_len, &k, - cmp_name, sizeof(cmp_name))<0) - goto err; - if (!base->global_randomize_case) { - if (strcmp(tmp_name, cmp_name) == 0) - name_matches = 1; - } else { - if (evutil_ascii_strcasecmp(tmp_name, cmp_name) == 0) - name_matches = 1; - } - + TEST_NAME; j += 4; - if (j > length) - goto err; + if (j > length) goto err; } if (!name_matches) @@ -1216,7 +1202,7 @@ static int request_parse(u8 *packet, int length, struct evdns_server_port *port, struct sockaddr *addr, ev_socklen_t addrlen) { int j = 0; /* index into packet */ - u16 t_; /* used by the macros */ + u16 _t; /* used by the macros */ char tmp_name[256]; /* used by the macros */ int i; @@ -1391,7 +1377,7 @@ nameserver_read(struct nameserver *ns) { (struct sockaddr*)&ns->address, 0)) { log(EVDNS_LOG_WARN, "Address mismatch on received " "DNS packet. Apparent source was %s", - evutil_format_sockaddr_port_( + evutil_format_sockaddr_port( (struct sockaddr *)&ss, addrbuf, sizeof(addrbuf))); return; @@ -1481,7 +1467,7 @@ nameserver_write_waiting(struct nameserver *ns, char waiting) { if (event_add(&ns->event, NULL) < 0) { char addrbuf[128]; log(EVDNS_LOG_WARN, "Error from libevent when adding event for %s", - evutil_format_sockaddr_port_( + evutil_format_sockaddr_port( (struct sockaddr *)&ns->address, addrbuf, sizeof(addrbuf))); /* ???? Do more? */ @@ -1602,20 +1588,20 @@ dnsname_to_labels(u8 *const buf, size_t buf_len, off_t j, struct dnslabel_table *table) { const char *end = name + name_len; int ref = 0; - u16 t_; + u16 _t; #define APPEND16(x) do { \ if (j + 2 > (off_t)buf_len) \ goto overflow; \ - t_ = htons(x); \ - memcpy(buf + j, &t_, 2); \ + _t = htons(x); \ + memcpy(buf + j, &_t, 2); \ j += 2; \ } while (0) #define APPEND32(x) do { \ if (j + 4 > (off_t)buf_len) \ goto overflow; \ - t32_ = htonl(x); \ - memcpy(buf + j, &t32_, 4); \ + _t32 = htonl(x); \ + memcpy(buf + j, &_t32, 4); \ j += 4; \ } while (0) @@ -1681,7 +1667,7 @@ evdns_request_data_build(const char *const name, const size_t name_len, const u16 trans_id, const u16 type, const u16 class, u8 *const buf, size_t buf_len) { off_t j = 0; /* current offset into buf */ - u16 t_; /* used by the macros */ + u16 _t; /* used by the macros */ APPEND16(trans_id); APPEND16(0x0100); /* standard query, recusion needed */ @@ -1756,9 +1742,9 @@ evdns_close_server_port(struct evdns_server_port *port) /* exported function */ int -evdns_server_request_add_reply(struct evdns_server_request *req_, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data) +evdns_server_request_add_reply(struct evdns_server_request *_req, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data) { - struct server_request *req = TO_SERVER_REQUEST(req_); + struct server_request *req = TO_SERVER_REQUEST(_req); struct server_reply_item **itemp, *item; int *countp; int result = -1; @@ -1893,8 +1879,8 @@ evdns_server_request_format_response(struct server_request *req, int err) unsigned char buf[1500]; size_t buf_len = sizeof(buf); off_t j = 0, r; - u16 t_; - u32 t32_; + u16 _t; + u32 _t32; int i; u16 flags; struct dnslabel_table table; @@ -1952,8 +1938,8 @@ evdns_server_request_format_response(struct server_request *req, int err) if (r < 0) goto overflow; j = r; - t_ = htons( (short) (j-name_start) ); - memcpy(buf+len_idx, &t_, 2); + _t = htons( (short) (j-name_start) ); + memcpy(buf+len_idx, &_t, 2); } else { APPEND16(item->datalen); if (j+item->datalen > (off_t)buf_len) @@ -1986,9 +1972,9 @@ overflow: /* exported function */ int -evdns_server_request_respond(struct evdns_server_request *req_, int err) +evdns_server_request_respond(struct evdns_server_request *_req, int err) { - struct server_request *req = TO_SERVER_REQUEST(req_); + struct server_request *req = TO_SERVER_REQUEST(_req); struct evdns_server_port *port = req->port; int r = -1; @@ -2134,18 +2120,18 @@ server_port_free(struct evdns_server_port *port) /* exported function */ int -evdns_server_request_drop(struct evdns_server_request *req_) +evdns_server_request_drop(struct evdns_server_request *_req) { - struct server_request *req = TO_SERVER_REQUEST(req_); + struct server_request *req = TO_SERVER_REQUEST(_req); server_request_free(req); return 0; } /* exported function */ int -evdns_server_request_get_requesting_addr(struct evdns_server_request *req_, struct sockaddr *sa, int addr_len) +evdns_server_request_get_requesting_addr(struct evdns_server_request *_req, struct sockaddr *sa, int addr_len) { - struct server_request *req = TO_SERVER_REQUEST(req_); + struct server_request *req = TO_SERVER_REQUEST(_req); if (addr_len < (int)req->addrlen) return -1; memcpy(sa, &(req->addr), req->addrlen); @@ -2168,30 +2154,29 @@ evdns_request_timeout_callback(evutil_socket_t fd, short events, void *arg) { log(EVDNS_LOG_DEBUG, "Request %p timed out", arg); EVDNS_LOCK(base); + req->ns->timedout++; + if (req->ns->timedout > req->base->global_max_nameserver_timeout) { + req->ns->timedout = 0; + nameserver_failed(req->ns, "request timed out."); + } + if (req->tx_count >= req->base->global_max_retransmits) { - struct nameserver *ns = req->ns; /* this request has failed */ log(EVDNS_LOG_DEBUG, "Giving up on request %p; tx_count==%d", arg, req->tx_count); reply_schedule_callback(req, 0, DNS_ERR_TIMEOUT, NULL); - request_finished(req, &REQ_HEAD(req->base, req->trans_id), 1); - nameserver_failed(ns, "request timed out."); } else { /* retransmit it */ + struct nameserver *new_ns; log(EVDNS_LOG_DEBUG, "Retransmitting request %p; tx_count==%d", arg, req->tx_count); (void) evtimer_del(&req->timeout_event); - request_swap_ns(req, nameserver_pick(base)); + new_ns = nameserver_pick(base); + if (new_ns) + req->ns = new_ns; evdns_request_transmit(req); - - req->ns->timedout++; - if (req->ns->timedout > req->base->global_max_nameserver_timeout) { - req->ns->timedout = 0; - nameserver_failed(req->ns, "request timed out."); - } } - EVDNS_UNLOCK(base); } @@ -2206,13 +2191,6 @@ evdns_request_transmit_to(struct request *req, struct nameserver *server) { int r; ASSERT_LOCKED(req->base); ASSERT_VALID_REQUEST(req); - - if (server->requests_inflight == 1 && - req->base->disable_when_inactive && - event_add(&server->event, NULL) < 0) { - return 1; - } - r = sendto(server->socket, (void*)req->request, req->request_len, 0, (struct sockaddr *)&server->address, server->addrlen); if (r < 0) { @@ -2321,7 +2299,7 @@ nameserver_send_probe(struct nameserver *const ns) { ASSERT_LOCKED(ns->base); log(EVDNS_LOG_DEBUG, "Sending probe to %s", - evutil_format_sockaddr_port_( + evutil_format_sockaddr_port( (struct sockaddr *)&ns->address, addrbuf, sizeof(addrbuf))); handle = mm_calloc(1, sizeof(*handle)); @@ -2482,7 +2460,7 @@ evdns_resume(void) } static int -evdns_nameserver_add_impl_(struct evdns_base *base, const struct sockaddr *address, int addrlen) { +_evdns_nameserver_add_impl(struct evdns_base *base, const struct sockaddr *address, int addrlen) { /* first check to see if we already have this nameserver */ const struct nameserver *server = base->server_head, *const started_at = base->server_head; @@ -2510,12 +2488,13 @@ evdns_nameserver_add_impl_(struct evdns_base *base, const struct sockaddr *addre evtimer_assign(&ns->timeout_event, ns->base->event_base, nameserver_prod_callback, ns); - ns->socket = evutil_socket_(address->sa_family, - SOCK_DGRAM|EVUTIL_SOCK_NONBLOCK|EVUTIL_SOCK_CLOEXEC, 0); + ns->socket = socket(address->sa_family, SOCK_DGRAM, 0); if (ns->socket < 0) { err = 1; goto out1; } + evutil_make_socket_closeonexec(ns->socket); + evutil_make_socket_nonblocking(ns->socket); if (base->global_outgoing_addrlen && - !evutil_sockaddr_is_loopback_(address)) { + !evutil_sockaddr_is_loopback(address)) { if (bind(ns->socket, (struct sockaddr*)&base->global_outgoing_address, base->global_outgoing_addrlen) < 0) { @@ -2528,15 +2507,14 @@ evdns_nameserver_add_impl_(struct evdns_base *base, const struct sockaddr *addre memcpy(&ns->address, address, addrlen); ns->addrlen = addrlen; ns->state = 1; - event_assign(&ns->event, ns->base->event_base, ns->socket, - EV_READ | EV_PERSIST, nameserver_ready_callback, ns); - if (!base->disable_when_inactive && event_add(&ns->event, NULL) < 0) { + event_assign(&ns->event, ns->base->event_base, ns->socket, EV_READ | EV_PERSIST, nameserver_ready_callback, ns); + if (event_add(&ns->event, NULL) < 0) { err = 2; goto out2; } log(EVDNS_LOG_DEBUG, "Added nameserver %s as %p", - evutil_format_sockaddr_port_(address, addrbuf, sizeof(addrbuf)), ns); + evutil_format_sockaddr_port(address, addrbuf, sizeof(addrbuf)), ns); /* insert this nameserver into the list of them */ if (!base->server_head) { @@ -2559,7 +2537,7 @@ out1: event_debug_unassign(&ns->event); mm_free(ns); log(EVDNS_LOG_WARN, "Unable to add nameserver %s: error %d", - evutil_format_sockaddr_port_(address, addrbuf, sizeof(addrbuf)), err); + evutil_format_sockaddr_port(address, addrbuf, sizeof(addrbuf)), err); return err; } @@ -2574,7 +2552,7 @@ evdns_base_nameserver_add(struct evdns_base *base, unsigned long int address) sin.sin_port = htons(53); sin.sin_family = AF_INET; EVDNS_LOCK(base); - res = evdns_nameserver_add_impl_(base, (struct sockaddr*)&sin, sizeof(sin)); + res = _evdns_nameserver_add_impl(base, (struct sockaddr*)&sin, sizeof(sin)); EVDNS_UNLOCK(base); return res; } @@ -2626,7 +2604,7 @@ evdns_base_nameserver_ip_add(struct evdns_base *base, const char *ip_as_string) sockaddr_setport(sa, 53); EVDNS_LOCK(base); - res = evdns_nameserver_add_impl_(base, sa, len); + res = _evdns_nameserver_add_impl(base, sa, len); EVDNS_UNLOCK(base); return res; } @@ -2645,39 +2623,11 @@ evdns_base_nameserver_sockaddr_add(struct evdns_base *base, int res; EVUTIL_ASSERT(base); EVDNS_LOCK(base); - res = evdns_nameserver_add_impl_(base, sa, len); + res = _evdns_nameserver_add_impl(base, sa, len); EVDNS_UNLOCK(base); return res; } -int -evdns_base_get_nameserver_addr(struct evdns_base *base, int idx, - struct sockaddr *sa, ev_socklen_t len) -{ - int result = -1; - int i; - struct nameserver *server; - EVDNS_LOCK(base); - server = base->server_head; - for (i = 0; i < idx && server; ++i, server = server->next) { - if (server->next == base->server_head) - goto done; - } - if (! server) - goto done; - - if (server->addrlen > len) { - result = (int) server->addrlen; - goto done; - } - - memcpy(sa, &server->address, server->addrlen); - result = (int) server->addrlen; -done: - EVDNS_UNLOCK(base); - return result; -} - /* remove from the queue */ static void evdns_request_remove(struct request *req, struct request **head) @@ -2781,7 +2731,7 @@ request_new(struct evdns_base *base, struct evdns_request *handle, int type, strlcpy(namebuf, name, sizeof(namebuf)); evutil_secure_rng_get_bytes(randbits, (name_len+7)/8); for (i = 0; i < name_len; ++i) { - if (EVUTIL_ISALPHA_(namebuf[i])) { + if (EVUTIL_ISALPHA(namebuf[i])) { if ((randbits[i >> 3] & (1<<(i & 7)))) namebuf[i] |= 0x20; else @@ -2829,10 +2779,7 @@ request_submit(struct request *const req) { /* if it has a nameserver assigned then this is going */ /* straight into the inflight queue */ evdns_request_insert(req, &REQ_HEAD(base, req->trans_id)); - base->global_requests_inflight++; - req->ns->requests_inflight++; - evdns_request_transmit(req); } else { evdns_request_insert(req, &base->req_waiting_head); @@ -3175,12 +3122,9 @@ search_set_from_hostname(struct evdns_base *base) { static char * search_make_new(const struct search_state *const state, int n, const char *const base_name) { const size_t base_len = strlen(base_name); - char need_to_append_dot; + const char need_to_append_dot = base_name[base_len - 1] == '.' ? 0 : 1; struct search_domain *dom; - if (!base_len) return NULL; - need_to_append_dot = base_name[base_len - 1] == '.' ? 0 : 1; - for (dom = state->head; dom; dom = dom->next) { if (!n--) { /* this is the postfix we want */ @@ -3319,7 +3263,7 @@ evdns_resolv_set_defaults(struct evdns_base *base, int flags) { if (flags & DNS_OPTION_NAMESERVERS) evdns_base_nameserver_ip_add(base,"127.0.0.1"); } -#ifndef EVENT__HAVE_STRTOK_R +#ifndef _EVENT_HAVE_STRTOK_R static char * strtok_r(char *s, const char *delim, char **state) { char *cp, *start; @@ -3353,7 +3297,7 @@ strtoint(const char *const str) /* Parse a number of seconds into a timeval; return -1 on error. */ static int -evdns_strtotimeval(const char *const str, struct timeval *out) +strtotimeval(const char *const str, struct timeval *out) { double d; char *endptr; @@ -3456,13 +3400,13 @@ evdns_base_set_option_impl(struct evdns_base *base, base->global_search_state->ndots = ndots; } else if (str_matches_option(option, "timeout:")) { struct timeval tv; - if (evdns_strtotimeval(val, &tv) == -1) return -1; + if (strtotimeval(val, &tv) == -1) return -1; if (!(flags & DNS_OPTION_MISC)) return 0; log(EVDNS_LOG_DEBUG, "Setting timeout to %s", val); memcpy(&base->global_timeout, &tv, sizeof(struct timeval)); } else if (str_matches_option(option, "getaddrinfo-allow-skew:")) { struct timeval tv; - if (evdns_strtotimeval(val, &tv) == -1) return -1; + if (strtotimeval(val, &tv) == -1) return -1; if (!(flags & DNS_OPTION_MISC)) return 0; log(EVDNS_LOG_DEBUG, "Setting getaddrinfo-allow-skew to %s", val); @@ -3504,7 +3448,7 @@ evdns_base_set_option_impl(struct evdns_base *base, base->global_outgoing_addrlen = len; } else if (str_matches_option(option, "initial-probe-timeout:")) { struct timeval tv; - if (evdns_strtotimeval(val, &tv) == -1) return -1; + if (strtotimeval(val, &tv) == -1) return -1; if (tv.tv_sec > 3600) tv.tv_sec = 3600; if (!(flags & DNS_OPTION_MISC)) return 0; @@ -3584,7 +3528,7 @@ evdns_base_resolv_conf_parse(struct evdns_base *base, int flags, const char *con static char * evdns_get_default_hosts_filename(void) { -#ifdef _WIN32 +#ifdef WIN32 /* Windows is a little coy about where it puts its configuration * files. Sure, they're _usually_ in C:\windows\system32, but * there's no reason in principle they couldn't be in @@ -3597,8 +3541,8 @@ evdns_get_default_hosts_filename(void) if (! SHGetSpecialFolderPathA(NULL, path, CSIDL_SYSTEM, 0)) return NULL; - len_out = strlen(path)+strlen(hostfile)+1; - path_out = mm_malloc(len_out); + len_out = strlen(path)+strlen(hostfile); + path_out = mm_malloc(len_out+1); evutil_snprintf(path_out, len_out, "%s%s", path, hostfile); return path_out; #else @@ -3622,7 +3566,7 @@ evdns_base_resolv_conf_parse_impl(struct evdns_base *base, int flags, const char mm_free(fname); } - if ((err = evutil_read_file_(filename, &resolv, &n, 0)) < 0) { + if ((err = evutil_read_file(filename, &resolv, &n, 0)) < 0) { if (err == -1) { /* No file. */ evdns_resolv_set_defaults(base, flags); @@ -3666,7 +3610,7 @@ evdns_resolv_conf_parse(int flags, const char *const filename) { } -#ifdef _WIN32 +#ifdef WIN32 /* Add multiple nameservers from a space-or-comma-separated list. */ static int evdns_nameserver_ip_add_line(struct evdns_base *base, const char *ips) { @@ -3709,7 +3653,7 @@ load_nameservers_with_getnetworkparams(struct evdns_base *base) GetNetworkParams_fn_t fn; ASSERT_LOCKED(base); - if (!(handle = evutil_load_windows_system_library_( + if (!(handle = evutil_load_windows_system_library( TEXT("iphlpapi.dll")))) { log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll"); status = -1; @@ -3868,18 +3812,17 @@ evdns_base_config_windows_nameservers(struct evdns_base *base) if (base == NULL) return -1; EVDNS_LOCK(base); - fname = evdns_get_default_hosts_filename(); - log(EVDNS_LOG_DEBUG, "Loading hosts entries from %s", fname); - evdns_base_load_hosts(base, fname); - if (fname) - mm_free(fname); - if (load_nameservers_with_getnetworkparams(base) == 0) { EVDNS_UNLOCK(base); return 0; } r = load_nameservers_from_registry(base); + fname = evdns_get_default_hosts_filename(); + evdns_base_load_hosts(base, fname); + if (fname) + mm_free(fname); + EVDNS_UNLOCK(base); return r; } @@ -3897,7 +3840,7 @@ evdns_config_windows_nameservers(void) #endif struct evdns_base * -evdns_base_new(struct event_base *event_base, int flags) +evdns_base_new(struct event_base *event_base, int initialize_nameservers) { struct evdns_base *base; @@ -3910,8 +3853,7 @@ evdns_base_new(struct event_base *event_base, int flags) /* Give the evutil library a hook into its evdns-enabled * functionality. We can't just call evdns_getaddrinfo directly or * else libevent-core will depend on libevent-extras. */ - evutil_set_evdns_getaddrinfo_fn_(evdns_getaddrinfo); - evutil_set_evdns_getaddrinfo_cancel_fn_(evdns_getaddrinfo_cancel); + evutil_set_evdns_getaddrinfo_fn(evdns_getaddrinfo); base = mm_malloc(sizeof(struct evdns_base)); if (base == NULL) @@ -3946,18 +3888,9 @@ evdns_base_new(struct event_base *event_base, int flags) TAILQ_INIT(&base->hostsdb); -#define EVDNS_BASE_ALL_FLAGS (0x8001) - if (flags & ~EVDNS_BASE_ALL_FLAGS) { - flags = EVDNS_BASE_INITIALIZE_NAMESERVERS; - log(EVDNS_LOG_WARN, - "Unrecognized flag passed to evdns_base_new(). Assuming " - "you meant EVDNS_BASE_INITIALIZE_NAMESERVERS."); - } -#undef EVDNS_BASE_ALL_FLAGS - - if (flags & EVDNS_BASE_INITIALIZE_NAMESERVERS) { + if (initialize_nameservers) { int r; -#ifdef _WIN32 +#ifdef WIN32 r = evdns_base_config_windows_nameservers(base); #else r = evdns_base_resolv_conf_parse(base, DNS_OPTIONS_ALL, "/etc/resolv.conf"); @@ -3967,10 +3900,6 @@ evdns_base_new(struct event_base *event_base, int flags) return NULL; } } - if (flags & EVDNS_BASE_DISABLE_WHEN_INACTIVE) { - base->disable_when_inactive = 1; - } - EVDNS_UNLOCK(base); return base; } @@ -4012,7 +3941,7 @@ static void evdns_nameserver_free(struct nameserver *server) { if (server->socket >= 0) - evutil_closesocket(server->socket); + evutil_closesocket(server->socket); (void) event_del(&server->event); event_debug_unassign(&server->event); if (server->state == 0) @@ -4036,6 +3965,15 @@ evdns_base_free_and_unlock(struct evdns_base *base, int fail_requests) /* TODO(nickm) we might need to refcount here. */ + for (server = base->server_head; server; server = server_next) { + server_next = server->next; + evdns_nameserver_free(server); + if (server_next == base->server_head) + break; + } + base->server_head = NULL; + base->global_good_nameservers = 0; + for (i = 0; i < base->n_req_heads; ++i) { while (base->req_heads[i]) { if (fail_requests) @@ -4050,16 +3988,6 @@ evdns_base_free_and_unlock(struct evdns_base *base, int fail_requests) } base->global_requests_inflight = base->global_requests_waiting = 0; - for (server = base->server_head; server; server = server_next) { - server_next = server->next; - /** already done something before */ - server->probe_request = NULL; - evdns_nameserver_free(server); - if (server_next == base->server_head) - break; - } - base->server_head = NULL; - base->global_good_nameservers = 0; if (base->global_search_state) { for (dom = base->global_search_state->head; dom; dom = dom_next) { @@ -4093,18 +4021,6 @@ evdns_base_free(struct evdns_base *base, int fail_requests) evdns_base_free_and_unlock(base, fail_requests); } -void -evdns_base_clear_host_addresses(struct evdns_base *base) -{ - struct hosts_entry *victim; - EVDNS_LOCK(base); - while ((victim = TAILQ_FIRST(&base->hostsdb))) { - TAILQ_REMOVE(&base->hostsdb, victim, next); - mm_free(victim); - } - EVDNS_UNLOCK(base); -} - void evdns_shutdown(int fail_requests) { @@ -4180,7 +4096,7 @@ evdns_base_load_hosts_impl(struct evdns_base *base, const char *hosts_fname) ASSERT_LOCKED(base); if (hosts_fname == NULL || - (err = evutil_read_file_(hosts_fname, &str, &len, 0)) < 0) { + (err = evutil_read_file(hosts_fname, &str, &len, 0)) < 0) { char tmp[64]; strlcpy(tmp, "127.0.0.1 localhost", sizeof(tmp)); evdns_base_parse_hosts_line(base, tmp); @@ -4409,23 +4325,17 @@ evdns_getaddrinfo_gotresolve(int result, char type, int count, other_req = &data->ipv4_request; } - /** Called from evdns_base_free() with @fail_requests == 1 */ - if (result != DNS_ERR_SHUTDOWN) { - EVDNS_LOCK(data->evdns_base); - if (evdns_result_is_answer(result)) { - if (req->type == DNS_IPv4_A) - ++data->evdns_base->getaddrinfo_ipv4_answered; - else - ++data->evdns_base->getaddrinfo_ipv6_answered; - } - user_canceled = data->user_canceled; - if (other_req->r == NULL) - data->request_done = 1; - EVDNS_UNLOCK(data->evdns_base); - } else { - data->evdns_base = NULL; - user_canceled = data->user_canceled; + EVDNS_LOCK(data->evdns_base); + if (evdns_result_is_answer(result)) { + if (req->type == DNS_IPv4_A) + ++data->evdns_base->getaddrinfo_ipv4_answered; + else + ++data->evdns_base->getaddrinfo_ipv6_answered; } + user_canceled = data->user_canceled; + if (other_req->r == NULL) + data->request_done = 1; + EVDNS_UNLOCK(data->evdns_base); req->r = NULL; @@ -4459,9 +4369,7 @@ evdns_getaddrinfo_gotresolve(int result, char type, int count, /* The other request is still working; maybe it will * succeed. */ /* XXXX handle failure from set_timeout */ - if (result != DNS_ERR_SHUTDOWN) { - evdns_getaddrinfo_set_timeout(data->evdns_base, data); - } + evdns_getaddrinfo_set_timeout(data->evdns_base, data); data->pending_error = err; return; } @@ -4522,7 +4430,7 @@ evdns_getaddrinfo_gotresolve(int result, char type, int count, for (i=0; i < count; ++i) { struct evutil_addrinfo *ai; memcpy(addrp, ((char*)addresses)+i*addrlen, addrlen); - ai = evutil_new_addrinfo_(sa, socklen, &data->hints); + ai = evutil_new_addrinfo(sa, socklen, &data->hints); if (!ai) { if (other_req->r) { evdns_cancel_request(NULL, other_req->r); @@ -4535,7 +4443,7 @@ evdns_getaddrinfo_gotresolve(int result, char type, int count, free_getaddrinfo_request(data); return; } - res = evutil_addrinfo_append_(res, ai); + res = evutil_addrinfo_append(res, ai); } if (other_req->r) { @@ -4549,10 +4457,10 @@ evdns_getaddrinfo_gotresolve(int result, char type, int count, * results (if any) and return them. */ if (data->pending_result) { if (req->type == DNS_IPv4_A) - res = evutil_addrinfo_append_(res, + res = evutil_addrinfo_append(res, data->pending_result); else - res = evutil_addrinfo_append_( + res = evutil_addrinfo_append( data->pending_result, res); data->pending_result = NULL; } @@ -4602,13 +4510,13 @@ evdns_getaddrinfo_fromhosts(struct evdns_base *base, if ((e->addr.sa.sa_family == AF_INET && f == PF_INET6) || (e->addr.sa.sa_family == AF_INET6 && f == PF_INET)) continue; - ai_new = evutil_new_addrinfo_(&e->addr.sa, e->addrlen, hints); + ai_new = evutil_new_addrinfo(&e->addr.sa, e->addrlen, hints); if (!ai_new) { n_found = 0; goto out; } sockaddr_setport(ai_new->ai_addr, port); - ai = evutil_addrinfo_append_(ai, ai_new); + ai = evutil_addrinfo_append(ai, ai_new); } EVDNS_UNLOCK(base); out: @@ -4663,14 +4571,14 @@ evdns_getaddrinfo(struct evdns_base *dns_base, hints.ai_family = PF_UNSPEC; } - evutil_adjust_hints_for_addrconfig_(&hints); + evutil_adjust_hints_for_addrconfig(&hints); /* Now try to see if we _can_ answer immediately. */ /* (It would be nice to do this by calling getaddrinfo directly, with * AI_NUMERICHOST, on plaforms that have it, but we can't: there isn't * a reliable way to distinguish the "that wasn't a numeric host!" case * from any other EAI_NONAME cases.) */ - err = evutil_getaddrinfo_common_(nodename, servname, &hints, &res, &port); + err = evutil_getaddrinfo_common(nodename, servname, &hints, &res, &port); if (err != EVUTIL_EAI_NEED_RESOLVE) { cb(err, res, arg); return NULL; @@ -4721,7 +4629,7 @@ evdns_getaddrinfo(struct evdns_base *dns_base, data->ipv4_request.r = evdns_base_resolve_ipv4(dns_base, nodename, 0, evdns_getaddrinfo_gotresolve, &data->ipv4_request); - if (want_cname && data->ipv4_request.r) + if (want_cname) data->ipv4_request.r->current_req->put_cname_in_ptr = &data->cname_result; } @@ -4732,7 +4640,7 @@ evdns_getaddrinfo(struct evdns_base *dns_base, data->ipv6_request.r = evdns_base_resolve_ipv6(dns_base, nodename, 0, evdns_getaddrinfo_gotresolve, &data->ipv6_request); - if (want_cname && data->ipv6_request.r) + if (want_cname) data->ipv6_request.r->current_req->put_cname_in_ptr = &data->cname_result; } -- cgit v1.2.3