[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r6978: eventdns: Document functions added to API; make suspended re (in tor/trunk: . src/or)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r6978: eventdns: Document functions added to API; make suspended re (in tor/trunk: . src/or)
- From: nickm@xxxxxxxx
- Date: Fri, 4 Aug 2006 14:27:10 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Fri, 04 Aug 2006 14:27:17 -0400
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: nickm
Date: 2006-08-04 14:27:10 -0400 (Fri, 04 Aug 2006)
New Revision: 6978
Modified:
tor/trunk/
tor/trunk/src/or/eventdns.c
Log:
r7011@Kushana: nickm | 2006-08-03 13:26:34 -0700
eventdns: Document functions added to API; make suspended requests go to the front of the queue; check (or explicitly ignore) return values on libevent functions.
Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
- 1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7010
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
+ 1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7011
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
Modified: tor/trunk/src/or/eventdns.c
===================================================================
--- tor/trunk/src/or/eventdns.c 2006-08-04 18:26:40 UTC (rev 6977)
+++ tor/trunk/src/or/eventdns.c 2006-08-04 18:27:10 UTC (rev 6978)
@@ -8,6 +8,8 @@
*
* TODO:
* - Support IPv6 and PTR records.
+ * - Replace all externally visible magic numbers with #defined constants.
+ * - Write doccumentation for APIs of all external functions.
*/
/* Async DNS Library
@@ -159,6 +161,26 @@
* Set the number of dots which, when found in a name, causes
* the first query to be without any search domain.
*
+ * int eventdns_count_nameservers(void)
+ * Return the number of configured nameservers (not necessarily the
+ * number of running nameservers). This is useful for double-checking
+ * whether our calls to the various nameserver configuration functions
+ * have been successful.
+ *
+ * int eventdns_clear_nameservers_and_suspend(void)
+ * Remove all currently configured nameservers, and suspend all pending
+ * resolves. Resolves will not necessarily be re-attempted until
+ * eventdns_resume() is called.
+ *
+ * int eventdns_resume(void)
+ * Re-attempt resolves left in limbo after an earlier call to
+ * eventdns_clear_nameservers_and_suspend().
+ *
+ * int eventdns_config_windows_nameservers(void)
+ * Attempt to configure a set of nameservers based on platform settings on
+ * a win32 host. Preferentially tries to use GetNetworkParams; if that fails,
+ * looks in the registry. Returns 0 on success, nonzero on failure.
+ *
* int eventdns_resolv_conf_parse(int flags, const char *filename)
* Parse a resolv.conf like file from the given filename.
*
@@ -488,14 +510,18 @@
nameserver_probe_failed(struct nameserver *const ns) {
const struct timeval * timeout;
assert(ns->state == 0);
- evtimer_del(&ns->timeout_event);
+ (void) evtimer_del(&ns->timeout_event);
timeout =
&global_nameserver_timeouts[MIN(ns->failed_times,
global_nameserver_timeouts_length - 1)];
ns->failed_times++;
evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
- evtimer_add(&ns->timeout_event, (struct timeval *) timeout);
+ if (evtimer_add(&ns->timeout_event, (struct timeval *) timeout) < 0) {
+ log("Error from libevent when adding timer event for %s",
+ debug_ntoa(ns->address));
+ // ???? Do more?
+ }
}
// called when a nameserver has been deemed to have failed. For example, too
@@ -518,7 +544,11 @@
ns->failed_times = 1;
evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
- evtimer_add(&ns->timeout_event, (struct timeval *) &global_nameserver_timeouts[0]);
+ if (evtimer_add(&ns->timeout_event, (struct timeval *) &global_nameserver_timeouts[0]) < 0) {
+ log("Error from libevent when adding timer event for %s",
+ debug_ntoa(ns->address));
+ // ???? Do more?
+ }
// walk the list of inflight requests to see if any can be reassigned to
// a different server. Requests in the waiting queue don't have a
@@ -914,10 +944,14 @@
if (ns->write_waiting == waiting) return;
ns->write_waiting = waiting;
- event_del(&ns->event);
+ (void) event_del(&ns->event);
event_set(&ns->event, ns->socket, EV_READ | (waiting ? EV_WRITE : 0) | EV_PERSIST,
nameserver_ready_callback, ns);
- event_add(&ns->event, NULL);
+ if (event_add(&ns->event, NULL) < 0) {
+ log("Error from libevent when adding event for %s",
+ debug_ntoa(ns->address));
+ // ???? Do more?
+ }
}
// a callback function. Called by libevent when the kernel says that
@@ -1046,7 +1080,7 @@
nameserver_failed(req->ns, "request timed out.");
}
- evtimer_del(&req->timeout_event);
+ (void) evtimer_del(&req->timeout_event);
if (req->tx_count >= global_max_retransmits) {
// this request has failed
req->user_callback(DNS_ERR_TIMEOUT, 0, 0, 0, NULL, req->user_pointer);
@@ -1114,7 +1148,11 @@
// all ok
log("Setting timeout for request %lx", (unsigned long) req);
evtimer_set(&req->timeout_event, eventdns_request_timeout_callback, req);
- evtimer_add(&req->timeout_event, &global_timeout);
+ if (evtimer_add(&req->timeout_event, &global_timeout) < 0) {
+ log("Error from libevent when adding timer for request %lx",
+ (unsigned long) req);
+ // ???? Do more?
+ }
req->tx_count++;
req->transmit_me = 0;
return retcode;
@@ -1200,8 +1238,8 @@
return 0;
while (1) {
struct nameserver *next = server->next;
- event_del(&server->event);
- evtimer_del(&server->timeout_event);
+ (void) event_del(&server->event);
+ (void) evtimer_del(&server->timeout_event);
if (server->socket >= 0)
CLOSE_SOCKET(server->socket);
free(server);
@@ -1210,23 +1248,31 @@
server = next;
}
server_head = NULL;
+ global_good_nameservers = 0;
while (req) {
struct request *next = req->next;
- req->next = req->prev = NULL;
req->tx_count = req->reissue_count = 0;
req->ns = NULL;
// ???? What to do about searches?
- evtimer_del(&req->timeout_event);
+ (void) evtimer_del(&req->timeout_event);
req->trans_id = 0;
req->transmit_me = 0;
+ global_requests_waiting++;
eventdns_request_insert(req, &req_waiting_head);
+ /* We want to insert these suspended elements at the front of
+ * the waiting queue, since they were pending before any of
+ * the waiting entries were added. This is a circular list,
+ * so we can just shift the start back by one.*/
+ req_waiting_head = req_waiting_head->prev;
+
if (next == req_started_at)
break;
req = next;
}
req_head = NULL;
+ global_requests_inflight = 0;
return 0;
}
@@ -1282,7 +1328,10 @@
ns->address = address;
ns->state = 1;
event_set(&ns->event, ns->socket, EV_READ | EV_PERSIST, nameserver_ready_callback, ns);
- event_add(&ns->event, NULL);
+ if (event_add(&ns->event, NULL) < 0) {
+ err = 2;
+ goto out2;
+ }
log("Added nameserver %s", debug_ntoa(address));