diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:47:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:47:58 -0500 |
| commit | 394a6bf4cdf91efb49b047e08012e834e04aa1c4 (patch) | |
| tree | d2f23622da158496cd4735a87073a11858accf71 /src/or/eventdns.c | |
| parent | 1e295666d9f4116ac8b69788fed34bbde7fc725d (diff) | |
| parent | bb5f99d4dfe119f82556ba4d9385d667a8414935 (diff) | |
| download | tor-394a6bf4cdf91efb49b047e08012e834e04aa1c4.tar.gz tor-394a6bf4cdf91efb49b047e08012e834e04aa1c4.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/eventdns.c')
| -rw-r--r-- | src/or/eventdns.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 4c6f60e89d..05831197d6 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1245,7 +1245,8 @@ nameserver_read(struct nameserver *ns) { for (;;) { const int r = - (int)recvfrom(ns->socket, packet, (socklen_t)sizeof(packet), 0, + (int)recvfrom(ns->socket, (void*)packet, + (socklen_t)sizeof(packet), 0, sa, &addrlen); if (r < 0) { int err = last_error(ns->socket); @@ -1276,7 +1277,7 @@ server_port_read(struct evdns_server_port *s) { for (;;) { addrlen = (socklen_t)sizeof(struct sockaddr_storage); - r = recvfrom(s->socket, packet, sizeof(packet), 0, + r = recvfrom(s->socket, (void*)packet, sizeof(packet), 0, (struct sockaddr*) &addr, &addrlen); if (r < 0) { int err = last_error(s->socket); @@ -2012,7 +2013,8 @@ evdns_request_timeout_callback(int fd, short events, void *arg) { /* 2 other failure */ static int evdns_request_transmit_to(struct evdns_request *req, struct nameserver *server) { - const ssize_t r = send(server->socket, req->request, req->request_len, 0); + const ssize_t r = send(server->socket, (void*)req->request, + req->request_len, 0); if (r < 0) { int err = last_error(server->socket); if (error_is_eagain(err)) return 1; |