nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

r15022@catbus: nickm | 2007-09-10 10:31:54 -0400

Browse Source 
remove yet more pointless differences between our eventdns.c and the evdns.c in libevent.


svn:r11425
This commit is contained in:
Nick Mathewson 2007-09-11 20:17:18 +00:00
parent 5828e4d5c4
commit c0130f9611
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/or/eventdns.c
View File

@ -755,7 +755,7 @@ reply_handle(struct request *const req, u16 flags, u32 ttl, struct reply *reply)
} }
} }
static int static INLINE int
name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) { name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) {
int name_end = -1; int name_end = -1;
int j = *idx; int j = *idx;
@ -775,7 +775,7 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) {
for(;;) { for(;;) {
u8 label_len; u8 label_len;
//if (j >= length) return -1; if (j >= length) return -1;
GET8(label_len); GET8(label_len);
if (!label_len) break; if (!label_len) break;
if (label_len & 0xc0) { if (label_len & 0xc0) {
@ -1693,8 +1693,8 @@ evdns_server_request_respond(struct evdns_server_request *_req, int err)
r = sendto(port->socket, req->response, req->response_len, 0, r = sendto(port->socket, req->response, req->response_len, 0,
(struct sockaddr*) &req->addr, req->addrlen); (struct sockaddr*) &req->addr, req->addrlen);
if (r<0) { if (r<0) {
int e = last_error(port->socket); int err = last_error(port->socket);
if (! error_is_eagain(e)) if (! error_is_eagain(err))
return -1; return -1;
if (port->pending_replies) { if (port->pending_replies) {
@ -1877,9 +1877,9 @@ static int
evdns_request_transmit_to(struct request *req, struct nameserver *server) { evdns_request_transmit_to(struct request *req, struct nameserver *server) {
const int r = send(server->socket, req->request, req->request_len, 0); const int r = send(server->socket, req->request, req->request_len, 0);
if (r < 0) { if (r < 0) {
int e = last_error(server->socket); int err = last_error(server->socket);
if (error_is_eagain(e)) return 1; if (error_is_eagain(err)) return 1;
nameserver_failed(req->ns, strerror(e)); nameserver_failed(req->ns, strerror(err));
return 2; return 2;
} else if (r != (int)req->request_len) { } else if (r != (int)req->request_len) {
return 1; /* short write */ return 1; /* short write */