Use tor_socket_strerror in eventdns.c. Fixes bug 987.

diff --git a/ChangeLog b/ChangeLog
index dafdf274abb38913f6a959ac597eb8e2b61d32f6..2de570dbbc333e277618bd0310115e5d3ba19e41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes in version 0.2.1.16-?? - 2009-??-??
+  o Minor bugfixes (on 0.2.0.x):
+    - Log correct error messages for DNS-related network errors on
+      Windows.
+
+
 Changes in version 0.2.1.15-rc - 2009-05-25
   o Major bugfixes (on 0.2.0.x):
     - Fix a timing-dependent, allocator-dependent, DNS-related crash bug

diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index cd1330314ba4c1c28a555b802f4571e9cfc432eb..4464148141bd6ea61cbec2c91d672b84b6678925 100644 (file)
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -1299,7 +1299,7 @@ nameserver_read(struct nameserver *ns) {
                if (r < 0) {
                        int err = last_error(ns->socket);
                        if (error_is_eagain(err)) return;
-                       nameserver_failed(ns, strerror(err));
+                       nameserver_failed(ns, tor_socket_strerror(err));
                        return;
                }
                /* XXX Match port too? */
@@ -1331,7 +1331,7 @@ server_port_read(struct evdns_server_port *s) {
                        int err = last_error(s->socket);
                        if (error_is_eagain(err)) return;
                        log(EVDNS_LOG_WARN, "Error %s (%d) while reading request.",
-                               strerror(err), err);
+                               tor_socket_strerror(err), err);
                        return;
                }
                request_parse(packet, r, s, (struct sockaddr*) &addr, addrlen);
@@ -1350,7 +1350,7 @@ server_port_flush(struct evdns_server_port *port)
                        int err = last_error(port->socket);
                        if (error_is_eagain(err))
                                return;
-                       log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", strerror(err), err);
+                       log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", tor_socket_strerror(err), err);
                }
                if (server_request_free(req)) {
                        /* we released the last reference to req->port. */
@@ -2063,7 +2063,7 @@ evdns_request_transmit_to(struct evdns_request *req, struct nameserver *server)
        if (r < 0) {
                int err = last_error(server->socket);
                if (error_is_eagain(err)) return 1;
-               nameserver_failed(req->ns, strerror(err));
+               nameserver_failed(req->ns, tor_socket_strerror(err));
                return 2;
        } else if (r != (ssize_t)req->request_len) {
                return 1;  /* short write */