mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Whoops: evdns_log, not tor_log, in src/ext/eventdns.c

Browse source
This commit is contained in:
Nick Mathewson 2013-02-04 10:07:02 -05:00
parent acb43c0735
commit ddf2c36ab1
1 changed files with 58 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
src/ext/eventdns.c
View file

@ -427,9 +427,9 @@ evdns_set_log_fn(evdns_debug_log_fn_type fn)
#define EVDNS_LOG_CHECK #define EVDNS_LOG_CHECK
#endif #endif
static void _evdns_log(int warn, const char *fmt, ...) EVDNS_LOG_CHECK; static void evdns_log(int warn, const char *fmt, ...) EVDNS_LOG_CHECK;
static void static void
_evdns_log(int warn, const char *fmt, ...) evdns_log(int warn, const char *fmt, ...)
{ {
va_list args; va_list args;
static char buf[512]; static char buf[512];
@ -446,8 +446,6 @@ _evdns_log(int warn, const char *fmt, ...)
va_end(args); va_end(args);
} }
#define log _evdns_log
static int static int
sockaddr_eq(const struct sockaddr *sa1, const struct sockaddr *sa2, sockaddr_eq(const struct sockaddr *sa1, const struct sockaddr *sa2,
int include_port) int include_port)
@ -534,7 +532,7 @@ nameserver_probe_failed(struct nameserver *const ns) {
ns->failed_times++; ns->failed_times++;
if (add_timeout_event(ns, (struct timeval *) timeout) < 0) { if (add_timeout_event(ns, (struct timeval *) timeout) < 0) {
tor_log(EVDNS_LOG_WARN, evdns_log(EVDNS_LOG_WARN,
"Error from libevent when adding timer event for %s", "Error from libevent when adding timer event for %s",
debug_ntop((struct sockaddr *)&ns->address)); debug_ntop((struct sockaddr *)&ns->address));
/* ???? Do more? */ /* ???? Do more? */
@ -550,19 +548,19 @@ nameserver_failed(struct nameserver *const ns, const char *msg) {
/* then don't do anything */ /* then don't do anything */
if (!ns->state) return; if (!ns->state) return;
tor_log(EVDNS_LOG_WARN, "Nameserver %s has failed: %s", evdns_log(EVDNS_LOG_WARN, "Nameserver %s has failed: %s",
debug_ntop((struct sockaddr *)&ns->address), msg); debug_ntop((struct sockaddr *)&ns->address), msg);
global_good_nameservers--; global_good_nameservers--;
assert(global_good_nameservers >= 0); assert(global_good_nameservers >= 0);
if (global_good_nameservers == 0) { if (global_good_nameservers == 0) {
tor_log(EVDNS_LOG_WARN, "All nameservers have failed"); evdns_log(EVDNS_LOG_WARN, "All nameservers have failed");
} }
ns->state = 0; ns->state = 0;
ns->failed_times = 1; ns->failed_times = 1;
if (add_timeout_event(ns, (struct timeval *) &global_nameserver_timeouts[0]) < 0) { if (add_timeout_event(ns, (struct timeval *) &global_nameserver_timeouts[0]) < 0) {
tor_log(EVDNS_LOG_WARN, evdns_log(EVDNS_LOG_WARN,
"Error from libevent when adding timer event for %s", "Error from libevent when adding timer event for %s",
debug_ntop((struct sockaddr *)&ns->address)); debug_ntop((struct sockaddr *)&ns->address));
/* ???? Do more? */ /* ???? Do more? */
@ -593,7 +591,7 @@ nameserver_failed(struct nameserver *const ns, const char *msg) {
static void static void
nameserver_up(struct nameserver *const ns) { nameserver_up(struct nameserver *const ns) {
if (ns->state) return; if (ns->state) return;
tor_log(EVDNS_LOG_WARN, "Nameserver %s is back up", evdns_log(EVDNS_LOG_WARN, "Nameserver %s is back up",
debug_ntop((struct sockaddr *)&ns->address)); debug_ntop((struct sockaddr *)&ns->address));
del_timeout_event(ns); del_timeout_event(ns);
ns->state = 1; ns->state = 1;
@ -624,7 +622,7 @@ request_finished(struct evdns_request *const req, struct evdns_request **head) {
} }
} }
tor_log(EVDNS_LOG_DEBUG, "Removing timeout for request %lx", evdns_log(EVDNS_LOG_DEBUG, "Removing timeout for request %lx",
(unsigned long) req); (unsigned long) req);
del_timeout_event(req); del_timeout_event(req);
@ -776,7 +774,7 @@ reply_handle(struct evdns_request *const req, u16 flags, u32 ttl, struct reply *
* confusing." Treat this as a timeout, not a failure. * confusing." Treat this as a timeout, not a failure.
*/ */
/*XXXX refactor the parts of */ /*XXXX refactor the parts of */
tor_log(EVDNS_LOG_DEBUG, "Got a SERVERFAILED from nameserver %s; " evdns_log(EVDNS_LOG_DEBUG, "Got a SERVERFAILED from nameserver %s; "
"will allow the request to time out.", "will allow the request to time out.",
debug_ntop((struct sockaddr *)&req->ns->address)); debug_ntop((struct sockaddr *)&req->ns->address));
break; break;
@ -1268,7 +1266,7 @@ nameserver_read(struct nameserver *ns) {
} }
/* XXX Match port too? */ /* XXX Match port too? */
if (!sockaddr_eq(sa, (struct sockaddr*)&ns->address, 0)) { if (!sockaddr_eq(sa, (struct sockaddr*)&ns->address, 0)) {
tor_log(EVDNS_LOG_WARN, evdns_log(EVDNS_LOG_WARN,
"Address mismatch on received DNS packet. Address was %s", "Address mismatch on received DNS packet. Address was %s",
debug_ntop(sa)); debug_ntop(sa));
return; return;
@ -1294,7 +1292,7 @@ server_port_read(struct evdns_server_port *s) {
if (r < 0) { if (r < 0) {
int err = last_error(s->socket); int err = last_error(s->socket);
if (error_is_eagain(err)) return; if (error_is_eagain(err)) return;
tor_log(EVDNS_LOG_WARN, "Error %s (%d) while reading request.", evdns_log(EVDNS_LOG_WARN, "Error %s (%d) while reading request.",
tor_socket_strerror(err), err); tor_socket_strerror(err), err);
return; return;
} }
@ -1314,7 +1312,7 @@ server_port_flush(struct evdns_server_port *port)
int err = last_error(port->socket); int err = last_error(port->socket);
if (error_is_eagain(err)) if (error_is_eagain(err))
return; return;
tor_log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", tor_socket_strerror(err), err); evdns_log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", tor_socket_strerror(err), err);
} }
if (server_request_free(req)) { if (server_request_free(req)) {
/* we released the last reference to req->port. */ /* we released the last reference to req->port. */
@ -1331,7 +1329,7 @@ server_port_flush(struct evdns_server_port *port)
event_set(&port->event, port->socket, EV_READ | EV_PERSIST, event_set(&port->event, port->socket, EV_READ | EV_PERSIST,
server_port_ready_callback, port); server_port_ready_callback, port);
if (event_add(&port->event, NULL) < 0) { if (event_add(&port->event, NULL) < 0) {
tor_log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server."); evdns_log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server.");
/* ???? Do more? */ /* ???? Do more? */
} }
} }
@ -1349,7 +1347,7 @@ nameserver_write_waiting(struct nameserver *ns, char waiting) {
event_set(&ns->event, ns->socket, EV_READ | (waiting ? EV_WRITE : 0) | EV_PERSIST, event_set(&ns->event, ns->socket, EV_READ | (waiting ? EV_WRITE : 0) | EV_PERSIST,
nameserver_ready_callback, ns); nameserver_ready_callback, ns);
if (event_add(&ns->event, NULL) < 0) { if (event_add(&ns->event, NULL) < 0) {
tor_log(EVDNS_LOG_WARN, "Error from libevent when adding event for %s", evdns_log(EVDNS_LOG_WARN, "Error from libevent when adding event for %s",
debug_ntop((struct sockaddr *)&ns->address)); debug_ntop((struct sockaddr *)&ns->address));
/* ???? Do more? */ /* ???? Do more? */
} }
@ -1859,7 +1857,7 @@ evdns_server_request_respond(struct evdns_server_request *_req, int err)
event_set(&port->event, port->socket, (port->closing?0:EV_READ) | EV_WRITE | EV_PERSIST, server_port_ready_callback, port); event_set(&port->event, port->socket, (port->closing?0:EV_READ) | EV_WRITE | EV_PERSIST, server_port_ready_callback, port);
if (event_add(&port->event, NULL) < 0) { if (event_add(&port->event, NULL) < 0) {
tor_log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server"); evdns_log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server");
} }
} }
@ -1995,7 +1993,7 @@ evdns_request_timeout_callback(int fd, short events, void *arg) {
(void) fd; (void) fd;
(void) events; (void) events;
tor_log(EVDNS_LOG_DEBUG, "Request %lx timed out", (unsigned long) arg); evdns_log(EVDNS_LOG_DEBUG, "Request %lx timed out", (unsigned long) arg);
req->ns->timedout++; req->ns->timedout++;
if (req->ns->timedout > global_max_nameserver_timeout) { if (req->ns->timedout > global_max_nameserver_timeout) {
@ -2074,11 +2072,11 @@ evdns_request_transmit(struct evdns_request *req) {
* and make us retransmit the request anyway. */ * and make us retransmit the request anyway. */
default: default:
/* transmitted; we need to check for timeout. */ /* transmitted; we need to check for timeout. */
tor_log(EVDNS_LOG_DEBUG, evdns_log(EVDNS_LOG_DEBUG,
"Setting timeout for request %lx", (unsigned long) req); "Setting timeout for request %lx", (unsigned long) req);
if (add_timeout_event(req, &global_timeout) < 0) { if (add_timeout_event(req, &global_timeout) < 0) {
tor_log(EVDNS_LOG_WARN, evdns_log(EVDNS_LOG_WARN,
"Error from libevent when adding timer for request %lx", "Error from libevent when adding timer for request %lx",
(unsigned long) req); (unsigned long) req);
/* ???? Do more? */ /* ???? Do more? */
@ -2126,7 +2124,7 @@ nameserver_send_probe(struct nameserver *const ns) {
addr = mm_malloc(sizeof(struct sockaddr_storage)); addr = mm_malloc(sizeof(struct sockaddr_storage));
memcpy(addr, &ns->address, sizeof(struct sockaddr_storage)); memcpy(addr, &ns->address, sizeof(struct sockaddr_storage));
tor_log(EVDNS_LOG_DEBUG, "Sending probe to %s", debug_ntop((struct sockaddr *)&ns->address)); evdns_log(EVDNS_LOG_DEBUG, "Sending probe to %s", debug_ntop((struct sockaddr *)&ns->address));
req = request_new(TYPE_A, "www.google.com", DNS_QUERY_NO_SEARCH, nameserver_probe_callback, addr); req = request_new(TYPE_A, "www.google.com", DNS_QUERY_NO_SEARCH, nameserver_probe_callback, addr);
if (!req) { if (!req) {
@ -2282,14 +2280,14 @@ _evdns_nameserver_add_impl(const struct sockaddr *address,
if (server) { if (server) {
do { do {
if (sockaddr_eq(address, (struct sockaddr *)&server->address, 1)) { if (sockaddr_eq(address, (struct sockaddr *)&server->address, 1)) {
tor_log(EVDNS_LOG_DEBUG, "Duplicate nameserver."); evdns_log(EVDNS_LOG_DEBUG, "Duplicate nameserver.");
return 3; return 3;
} }
server = server->next; server = server->next;
} while (server != started_at); } while (server != started_at);
} }
if (addrlen > (int)sizeof(ns->address)) { if (addrlen > (int)sizeof(ns->address)) {
tor_log(EVDNS_LOG_DEBUG, "Addrlen %d too long.", (int)addrlen); evdns_log(EVDNS_LOG_DEBUG, "Addrlen %d too long.", (int)addrlen);
return 2; return 2;
} }
@ -2315,14 +2313,14 @@ _evdns_nameserver_add_impl(const struct sockaddr *address,
!sockaddr_is_loopback((struct sockaddr*)&global_bind_address)) { !sockaddr_is_loopback((struct sockaddr*)&global_bind_address)) {
if (bind(ns->socket, (struct sockaddr *)&global_bind_address, if (bind(ns->socket, (struct sockaddr *)&global_bind_address,
global_bind_addrlen) < 0) { global_bind_addrlen) < 0) {
tor_log(EVDNS_LOG_DEBUG, "Couldn't bind to outgoing address."); evdns_log(EVDNS_LOG_DEBUG, "Couldn't bind to outgoing address.");
err = 2; err = 2;
goto out2; goto out2;
} }
} }
if (connect(ns->socket, address, addrlen) != 0) { if (connect(ns->socket, address, addrlen) != 0) {
tor_log(EVDNS_LOG_DEBUG, "Couldn't open socket to nameserver."); evdns_log(EVDNS_LOG_DEBUG, "Couldn't open socket to nameserver.");
err = 2; err = 2;
goto out2; goto out2;
} }
@ -2331,12 +2329,12 @@ _evdns_nameserver_add_impl(const struct sockaddr *address,
ns->state = 1; ns->state = 1;
event_set(&ns->event, ns->socket, EV_READ | EV_PERSIST, nameserver_ready_callback, ns); event_set(&ns->event, ns->socket, EV_READ | EV_PERSIST, nameserver_ready_callback, ns);
if (event_add(&ns->event, NULL) < 0) { if (event_add(&ns->event, NULL) < 0) {
tor_log(EVDNS_LOG_DEBUG, "Couldn't add event for nameserver."); evdns_log(EVDNS_LOG_DEBUG, "Couldn't add event for nameserver.");
err = 2; err = 2;
goto out2; goto out2;
} }
tor_log(EVDNS_LOG_DEBUG, "Added nameserver %s", debug_ntop(address)); evdns_log(EVDNS_LOG_DEBUG, "Added nameserver %s", debug_ntop(address));
/* insert this nameserver into the list of them */ /* insert this nameserver into the list of them */
if (!server_head) { if (!server_head) {
@ -2360,7 +2358,7 @@ out2:
out1: out1:
CLEAR(ns); CLEAR(ns);
mm_free(ns); mm_free(ns);
tor_log(EVDNS_LOG_WARN, "Unable to add nameserver %s: error %d", debug_ntop(address), err); evdns_log(EVDNS_LOG_WARN, "Unable to add nameserver %s: error %d", debug_ntop(address), err);
return err; return err;
} }
@ -2393,18 +2391,18 @@ evdns_nameserver_ip_add(const char *ip_as_string) {
* ipv4 * ipv4
*/ */
tor_log(EVDNS_LOG_DEBUG, "Trying to add nameserver <%s>", ip_as_string); evdns_log(EVDNS_LOG_DEBUG, "Trying to add nameserver <%s>", ip_as_string);
cp = strchr(ip_as_string, ':'); cp = strchr(ip_as_string, ':');
if (*ip_as_string == '[') { if (*ip_as_string == '[') {
size_t len; size_t len;
if (!(cp = strchr(ip_as_string, ']'))) { if (!(cp = strchr(ip_as_string, ']'))) {
tor_log(EVDNS_LOG_DEBUG, "Nameserver missing closing ]"); evdns_log(EVDNS_LOG_DEBUG, "Nameserver missing closing ]");
return 4; return 4;
} }
len = cp-(ip_as_string + 1); len = cp-(ip_as_string + 1);
if (len > sizeof(buf)-1) { if (len > sizeof(buf)-1) {
tor_log(EVDNS_LOG_DEBUG, "[Nameserver] does not fit in buffer."); evdns_log(EVDNS_LOG_DEBUG, "[Nameserver] does not fit in buffer.");
return 4; return 4;
} }
memcpy(buf, ip_as_string+1, len); memcpy(buf, ip_as_string+1, len);
@ -2422,7 +2420,7 @@ evdns_nameserver_ip_add(const char *ip_as_string) {
} else if (cp) { } else if (cp) {
is_ipv6 = 0; is_ipv6 = 0;
if (cp - ip_as_string > (int)sizeof(buf)-1) { if (cp - ip_as_string > (int)sizeof(buf)-1) {
tor_log(EVDNS_LOG_DEBUG, "Nameserver does not fit in buffer."); evdns_log(EVDNS_LOG_DEBUG, "Nameserver does not fit in buffer.");
return 4; return 4;
} }
memcpy(buf, ip_as_string, cp-ip_as_string); memcpy(buf, ip_as_string, cp-ip_as_string);
@ -2440,7 +2438,7 @@ evdns_nameserver_ip_add(const char *ip_as_string) {
} else { } else {
port = strtoint(port_part); port = strtoint(port_part);
if (port <= 0 || port > 65535) { if (port <= 0 || port > 65535) {
tor_log(EVDNS_LOG_DEBUG, "Nameserver port <%s> out of range", evdns_log(EVDNS_LOG_DEBUG, "Nameserver port <%s> out of range",
port_part); port_part);
return 4; return 4;
} }
@ -2457,7 +2455,7 @@ evdns_nameserver_ip_add(const char *ip_as_string) {
sin6.sin6_family = AF_INET6; sin6.sin6_family = AF_INET6;
sin6.sin6_port = htons(port); sin6.sin6_port = htons(port);
if (1 != tor_inet_pton(AF_INET6, addr_part, &sin6.sin6_addr)) { if (1 != tor_inet_pton(AF_INET6, addr_part, &sin6.sin6_addr)) {
tor_log(EVDNS_LOG_DEBUG, "inet_pton(%s) failed", addr_part); evdns_log(EVDNS_LOG_DEBUG, "inet_pton(%s) failed", addr_part);
return 4; return 4;
} }
return _evdns_nameserver_add_impl((struct sockaddr*)&sin6, return _evdns_nameserver_add_impl((struct sockaddr*)&sin6,
@ -2471,7 +2469,7 @@ evdns_nameserver_ip_add(const char *ip_as_string) {
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
sin.sin_port = htons(port); sin.sin_port = htons(port);
if (!inet_aton(addr_part, &sin.sin_addr)) { if (!inet_aton(addr_part, &sin.sin_addr)) {
tor_log(EVDNS_LOG_DEBUG, "inet_pton(%s) failed", addr_part); evdns_log(EVDNS_LOG_DEBUG, "inet_pton(%s) failed", addr_part);
return 4; return 4;
} }
return _evdns_nameserver_add_impl((struct sockaddr*)&sin, return _evdns_nameserver_add_impl((struct sockaddr*)&sin,
@ -2594,7 +2592,7 @@ request_submit(struct evdns_request *const req) {
/* exported function */ /* exported function */
int evdns_resolve_ipv4(const char *name, int flags, int evdns_resolve_ipv4(const char *name, int flags,
evdns_callback_type callback, void *ptr) { evdns_callback_type callback, void *ptr) {
tor_log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name); evdns_log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name);
if (flags & DNS_QUERY_NO_SEARCH) { if (flags & DNS_QUERY_NO_SEARCH) {
struct evdns_request *const req = struct evdns_request *const req =
request_new(TYPE_A, name, flags, callback, ptr); request_new(TYPE_A, name, flags, callback, ptr);
@ -2610,7 +2608,7 @@ int evdns_resolve_ipv4(const char *name, int flags,
/* exported function */ /* exported function */
int evdns_resolve_ipv6(const char *name, int flags, int evdns_resolve_ipv6(const char *name, int flags,
evdns_callback_type callback, void *ptr) { evdns_callback_type callback, void *ptr) {
tor_log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name); evdns_log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name);
if (flags & DNS_QUERY_NO_SEARCH) { if (flags & DNS_QUERY_NO_SEARCH) {
struct evdns_request *const req = struct evdns_request *const req =
request_new(TYPE_AAAA, name, flags, callback, ptr); request_new(TYPE_AAAA, name, flags, callback, ptr);
@ -2634,7 +2632,7 @@ int evdns_resolve_reverse(const struct in_addr *in, int flags, evdns_callback_ty
(int)(u8)((a>>8 )&0xff), (int)(u8)((a>>8 )&0xff),
(int)(u8)((a>>16)&0xff), (int)(u8)((a>>16)&0xff),
(int)(u8)((a>>24)&0xff)); (int)(u8)((a>>24)&0xff));
tor_log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf); evdns_log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf);
req = request_new(TYPE_PTR, buf, flags, callback, ptr); req = request_new(TYPE_PTR, buf, flags, callback, ptr);
if (!req) return 1; if (!req) return 1;
request_submit(req); request_submit(req);
@ -2658,7 +2656,7 @@ int evdns_resolve_reverse_ipv6(const struct in6_addr *in, int flags, evdns_callb
} }
assert(cp + strlen("ip6.arpa") < buf+sizeof(buf)); assert(cp + strlen("ip6.arpa") < buf+sizeof(buf));
memcpy(cp, "ip6.arpa", strlen("ip6.arpa")+1); memcpy(cp, "ip6.arpa", strlen("ip6.arpa")+1);
tor_log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf); evdns_log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf);
req = request_new(TYPE_PTR, buf, flags, callback, ptr); req = request_new(TYPE_PTR, buf, flags, callback, ptr);
if (!req) return 1; if (!req) return 1;
request_submit(req); request_submit(req);
@ -2874,7 +2872,7 @@ search_try_next(struct evdns_request *const req) {
if (string_num_dots(req->search_origname) < req->search_state->ndots) { if (string_num_dots(req->search_origname) < req->search_state->ndots) {
/* yep, we need to try it raw */ /* yep, we need to try it raw */
struct evdns_request *const newreq = request_new(req->request_type, req->search_origname, req->search_flags, req->user_callback, req->user_pointer); struct evdns_request *const newreq = request_new(req->request_type, req->search_origname, req->search_flags, req->user_callback, req->user_pointer);
tor_log(EVDNS_LOG_DEBUG, "Search: trying raw query %s", req->search_origname); evdns_log(EVDNS_LOG_DEBUG, "Search: trying raw query %s", req->search_origname);
if (newreq) { if (newreq) {
request_submit(newreq); request_submit(newreq);
return 0; return 0;
@ -2885,7 +2883,7 @@ search_try_next(struct evdns_request *const req) {
new_name = search_make_new(req->search_state, req->search_index, req->search_origname); new_name = search_make_new(req->search_state, req->search_index, req->search_origname);
if (!new_name) return 1; if (!new_name) return 1;
tor_log(EVDNS_LOG_DEBUG, "Search: now trying %s (%d)", new_name, req->search_index); evdns_log(EVDNS_LOG_DEBUG, "Search: now trying %s (%d)", new_name, req->search_index);
newreq = request_new(req->request_type, new_name, req->search_flags, req->user_callback, req->user_pointer); newreq = request_new(req->request_type, new_name, req->search_flags, req->user_callback, req->user_pointer);
mm_free(new_name); mm_free(new_name);
if (!newreq) return 1; if (!newreq) return 1;
@ -2955,7 +2953,7 @@ evdns_set_option(const char *option, const char *val, int flags)
const int ndots = strtoint(val); const int ndots = strtoint(val);
if (ndots == -1) return -1; if (ndots == -1) return -1;
if (!(flags & DNS_OPTION_SEARCH)) return 0; if (!(flags & DNS_OPTION_SEARCH)) return 0;
tor_log(EVDNS_LOG_DEBUG, "Setting ndots to %d", ndots); evdns_log(EVDNS_LOG_DEBUG, "Setting ndots to %d", ndots);
if (!global_search_state) global_search_state = search_state_new(); if (!global_search_state) global_search_state = search_state_new();
if (!global_search_state) return -1; if (!global_search_state) return -1;
global_search_state->ndots = ndots; global_search_state->ndots = ndots;
@ -2963,20 +2961,20 @@ evdns_set_option(const char *option, const char *val, int flags)
const int timeout = strtoint(val); const int timeout = strtoint(val);
if (timeout == -1) return -1; if (timeout == -1) return -1;
if (!(flags & DNS_OPTION_MISC)) return 0; if (!(flags & DNS_OPTION_MISC)) return 0;
tor_log(EVDNS_LOG_DEBUG, "Setting timeout to %d", timeout); evdns_log(EVDNS_LOG_DEBUG, "Setting timeout to %d", timeout);
global_timeout.tv_sec = timeout; global_timeout.tv_sec = timeout;
} else if (!strncmp(option, "max-timeouts:", 12)) { } else if (!strncmp(option, "max-timeouts:", 12)) {
const int maxtimeout = strtoint_clipped(val, 1, 255); const int maxtimeout = strtoint_clipped(val, 1, 255);
if (maxtimeout == -1) return -1; if (maxtimeout == -1) return -1;
if (!(flags & DNS_OPTION_MISC)) return 0; if (!(flags & DNS_OPTION_MISC)) return 0;
tor_log(EVDNS_LOG_DEBUG, "Setting maximum allowed timeouts to %d", evdns_log(EVDNS_LOG_DEBUG, "Setting maximum allowed timeouts to %d",
maxtimeout); maxtimeout);
global_max_nameserver_timeout = maxtimeout; global_max_nameserver_timeout = maxtimeout;
} else if (!strncmp(option, "max-inflight:", 13)) { } else if (!strncmp(option, "max-inflight:", 13)) {
const int maxinflight = strtoint_clipped(val, 1, 65000); const int maxinflight = strtoint_clipped(val, 1, 65000);
if (maxinflight == -1) return -1; if (maxinflight == -1) return -1;
if (!(flags & DNS_OPTION_MISC)) return 0; if (!(flags & DNS_OPTION_MISC)) return 0;
tor_log(EVDNS_LOG_DEBUG, "Setting maximum inflight requests to %d", evdns_log(EVDNS_LOG_DEBUG, "Setting maximum inflight requests to %d",
maxinflight); maxinflight);
global_max_requests_inflight = maxinflight; global_max_requests_inflight = maxinflight;
} else if (!strncmp(option, "attempts:", 9)) { } else if (!strncmp(option, "attempts:", 9)) {
@ -2984,12 +2982,12 @@ evdns_set_option(const char *option, const char *val, int flags)
if (retries == -1) return -1; if (retries == -1) return -1;
if (retries > 255) retries = 255; if (retries > 255) retries = 255;
if (!(flags & DNS_OPTION_MISC)) return 0; if (!(flags & DNS_OPTION_MISC)) return 0;
tor_log(EVDNS_LOG_DEBUG, "Setting retries to %d", retries); evdns_log(EVDNS_LOG_DEBUG, "Setting retries to %d", retries);
global_max_retransmits = retries; global_max_retransmits = retries;
} else if (!strncmp(option, "randomize-case:", 15)) { } else if (!strncmp(option, "randomize-case:", 15)) {
int randcase = strtoint(val); int randcase = strtoint(val);
if (!(flags & DNS_OPTION_MISC)) return 0; if (!(flags & DNS_OPTION_MISC)) return 0;
tor_log(EVDNS_LOG_DEBUG, "Setting randomize_case to %d", randcase); evdns_log(EVDNS_LOG_DEBUG, "Setting randomize_case to %d", randcase);
global_randomize_case = randcase; global_randomize_case = randcase;
} }
return 0; return 0;
@ -3047,7 +3045,7 @@ evdns_resolv_conf_parse(int flags, const char *const filename) {
char *start; char *start;
int err = 0; int err = 0;
tor_log(EVDNS_LOG_DEBUG, "Parsing resolv.conf file %s", filename); evdns_log(EVDNS_LOG_DEBUG, "Parsing resolv.conf file %s", filename);
fd = tor_open_cloexec(filename, O_RDONLY, 0); fd = tor_open_cloexec(filename, O_RDONLY, 0);
if (fd < 0) { if (fd < 0) {
@ -3146,13 +3144,13 @@ load_nameservers_with_getnetworkparams(void)
GetNetworkParams_fn_t fn; GetNetworkParams_fn_t fn;
if (!(handle = load_windows_system_library(TEXT("iphlpapi.dll")))) { if (!(handle = load_windows_system_library(TEXT("iphlpapi.dll")))) {
tor_log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll"); evdns_log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll");
/* right now status = 0, doesn't that mean "good" - mikec */ /* right now status = 0, doesn't that mean "good" - mikec */
status = -1; status = -1;
goto done; goto done;
} }
if (!(fn = (GetNetworkParams_fn_t) GetProcAddress(handle, TEXT("GetNetworkParams")))) { if (!(fn = (GetNetworkParams_fn_t) GetProcAddress(handle, TEXT("GetNetworkParams")))) {
tor_log(EVDNS_LOG_WARN, "Could not get address of function."); evdns_log(EVDNS_LOG_WARN, "Could not get address of function.");
/* same as above */ /* same as above */
status = -1; status = -1;
goto done; goto done;
@ -3173,7 +3171,7 @@ load_nameservers_with_getnetworkparams(void)
fixed = buf; fixed = buf;
r = fn(fixed, &size); r = fn(fixed, &size);
if (r != ERROR_SUCCESS) { if (r != ERROR_SUCCESS) {
tor_log(EVDNS_LOG_DEBUG, "fn() failed."); evdns_log(EVDNS_LOG_DEBUG, "fn() failed.");
status = -1; status = -1;
goto done; goto done;
} }
@ -3185,12 +3183,12 @@ load_nameservers_with_getnetworkparams(void)
while (ns) { while (ns) {
r = evdns_nameserver_ip_add_line(ns->IpAddress.String); r = evdns_nameserver_ip_add_line(ns->IpAddress.String);
if (r) { if (r) {
tor_log(EVDNS_LOG_DEBUG,"Could not add nameserver %s to list, " evdns_log(EVDNS_LOG_DEBUG,"Could not add nameserver %s to list, "
"error: %d; status: %d", "error: %d; status: %d",
(ns->IpAddress.String),(int)GetLastError(), r); (ns->IpAddress.String),(int)GetLastError(), r);
status = r; status = r;
} else { } else {
tor_log(EVDNS_LOG_DEBUG,"Successfully added %s as nameserver",ns->IpAddress.String); evdns_log(EVDNS_LOG_DEBUG,"Successfully added %s as nameserver",ns->IpAddress.String);
added_any++; added_any++;
} }
@ -3198,7 +3196,7 @@ load_nameservers_with_getnetworkparams(void)
} }
if (!added_any) { if (!added_any) {
tor_log(EVDNS_LOG_DEBUG, "No nameservers added."); evdns_log(EVDNS_LOG_DEBUG, "No nameservers added.");
if (status == 0) if (status == 0)
status = -1; status = -1;
} else { } else {
@ -3254,10 +3252,10 @@ load_nameservers_from_registry(void)
#define TRY(k, name) \ #define TRY(k, name) \
if (!found && config_nameserver_from_reg_key(k,TEXT(name)) == 0) { \ if (!found && config_nameserver_from_reg_key(k,TEXT(name)) == 0) { \
tor_log(EVDNS_LOG_DEBUG,"Found nameservers in %s/%s",#k,name); \ evdns_log(EVDNS_LOG_DEBUG,"Found nameservers in %s/%s",#k,name); \
found = 1; \ found = 1; \
} else if (!found) { \ } else if (!found) { \
tor_log(EVDNS_LOG_DEBUG,"Didn't find nameservers in %s/%s", \ evdns_log(EVDNS_LOG_DEBUG,"Didn't find nameservers in %s/%s", \
#k,#name); \ #k,#name); \
} }
@ -3266,14 +3264,14 @@ load_nameservers_from_registry(void)
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
KEY_READ, &nt_key) != ERROR_SUCCESS) { KEY_READ, &nt_key) != ERROR_SUCCESS) {
tor_log(EVDNS_LOG_DEBUG,"Couldn't open nt key, %d",(int)GetLastError()); evdns_log(EVDNS_LOG_DEBUG,"Couldn't open nt key, %d",(int)GetLastError());
return -1; return -1;
} }
r = RegOpenKeyEx(nt_key, TEXT("Interfaces"), 0, r = RegOpenKeyEx(nt_key, TEXT("Interfaces"), 0,
KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS, KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,
&interfaces_key); &interfaces_key);
if (r != ERROR_SUCCESS) { if (r != ERROR_SUCCESS) {
tor_log(EVDNS_LOG_DEBUG,"Couldn't open interfaces key, %d",(int)GetLastError()); evdns_log(EVDNS_LOG_DEBUG,"Couldn't open interfaces key, %d",(int)GetLastError());
return -1; return -1;
} }
TRY(nt_key, "NameServer"); TRY(nt_key, "NameServer");
@ -3286,7 +3284,7 @@ load_nameservers_from_registry(void)
HKEY win_key = 0; HKEY win_key = 0;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X_KEY, 0, if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X_KEY, 0,
KEY_READ, &win_key) != ERROR_SUCCESS) { KEY_READ, &win_key) != ERROR_SUCCESS) {
tor_log(EVDNS_LOG_DEBUG, "Couldn't open registry key, %d", (int)GetLastError()); evdns_log(EVDNS_LOG_DEBUG, "Couldn't open registry key, %d", (int)GetLastError());
return -1; return -1;
} }
TRY(win_key, "NameServer"); TRY(win_key, "NameServer");
@ -3294,7 +3292,7 @@ load_nameservers_from_registry(void)
} }
if (found == 0) { if (found == 0) {
tor_log(EVDNS_LOG_WARN,"Didn't find any nameservers."); evdns_log(EVDNS_LOG_WARN,"Didn't find any nameservers.");
} }
return found ? 0 : -1; return found ? 0 : -1;