diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-05-25 16:43:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-05-25 16:43:52 -0400 |
| commit | b805e5debf039fb7e48b8d846859f9f24d5c753a (patch) | |
| tree | b9d0eb29f18dcb9d0013d39b9eac9fb3265dd3ad /src/or/eventdns.c | |
| parent | 3b47be20ec377cd249904d24953d821b2dca5604 (diff) | |
| parent | 99c315a473bdeb25680d07f7aaca089a6c1f8ecb (diff) | |
| download | tor-b805e5debf039fb7e48b8d846859f9f24d5c753a.tar.gz tor-b805e5debf039fb7e48b8d846859f9f24d5c753a.zip | |
Merge commit 'origin/maint-0.2.1' into master.
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
Diffstat (limited to 'src/or/eventdns.c')
| -rw-r--r-- | src/or/eventdns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 079e353e97..34c16248dd 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1248,7 +1248,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? */ @@ -1280,7 +1280,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); @@ -1299,7 +1299,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. */ @@ -2011,7 +2011,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 */ |