9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix problems with resolver not responding and epoll.

Browse source 
Read from resolver socket until it is no longer ready.
This commit is contained in:
Jilles Tjoelker 2008-07-30 19:53:54 +02:00
parent 88fc1aeb68
commit ce1cab0ffd
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/res.c
View file

@ -731,9 +731,10 @@ static int proc_answer(struct reslist *request, HEADER * header, char *buf, char
} }
/* /*
* res_readreply - read a dns reply from the nameserver and process it. * res_read_single_reply - read a dns reply from the nameserver and process it.
* Return value: 1 if a packet was read, 0 otherwise
*/ */
static void res_readreply(rb_fde_t *F, void *data) static int res_read_single_reply(rb_fde_t *F, void *data)
{ {
char buf[sizeof(HEADER) + MAXPACKET] char buf[sizeof(HEADER) + MAXPACKET]
/* Sparc and alpha need 16bit-alignment for accessing header->id /* Sparc and alpha need 16bit-alignment for accessing header->id
@ -754,13 +755,13 @@ static void res_readreply(rb_fde_t *F, void *data)
rc = recvfrom(rb_get_fd(F), buf, sizeof(buf), 0, (struct sockaddr *)&lsin, &len); rc = recvfrom(rb_get_fd(F), buf, sizeof(buf), 0, (struct sockaddr *)&lsin, &len);
/* Re-schedule a read *after* recvfrom, or we'll be registering /* No packet */
* interest where it'll instantly be ready for read :-) -- adrian if (rc == 0 || rc == -1)
*/ return 0;
rb_setselect(F, RB_SELECT_READ, res_readreply, NULL);
/* Better to cast the sizeof instead of rc */ /* Too small */
if (rc <= (int)(sizeof(HEADER))) if (rc <= (int)(sizeof(HEADER)))
return; return 1;
/* /*
* convert DNS reply reader from Network byte order to CPU byte order. * convert DNS reply reader from Network byte order to CPU byte order.
@ -776,16 +777,16 @@ static void res_readreply(rb_fde_t *F, void *data)
* just ignore this response. * just ignore this response.
*/ */
if (0 == (request = find_id(header->id))) if (0 == (request = find_id(header->id)))
return; return 1;
/* /*
* check against possibly fake replies * check against possibly fake replies
*/ */
if (!res_ourserver(&lsin)) if (!res_ourserver(&lsin))
return; return 1;
if (!check_question(request, header, buf, buf + rc)) if (!check_question(request, header, buf, buf + rc))
return; return 1;
if ((header->rcode != NO_ERRORS) || (header->ancount == 0)) if ((header->rcode != NO_ERRORS) || (header->ancount == 0))
{ {
@ -803,7 +804,7 @@ static void res_readreply(rb_fde_t *F, void *data)
(*request->query->callback) (request->query->ptr, NULL); (*request->query->callback) (request->query->ptr, NULL);
rem_request(request); rem_request(request);
} }
return; return 1;
} }
/* /*
* If this fails there was an error decoding the received packet, * If this fails there was an error decoding the received packet,
@ -823,7 +824,7 @@ static void res_readreply(rb_fde_t *F, void *data)
*/ */
(*request->query->callback) (request->query->ptr, reply); (*request->query->callback) (request->query->ptr, reply);
rem_request(request); rem_request(request);
return; return 1;
} }
/* /*
@ -856,6 +857,14 @@ static void res_readreply(rb_fde_t *F, void *data)
(*request->query->callback) (request->query->ptr, NULL); (*request->query->callback) (request->query->ptr, NULL);
rem_request(request); rem_request(request);
} }
return 1;
}
static void res_readreply(rb_fde_t *F, void *data)
{
while (res_read_single_reply(F, data))
;
rb_setselect(F, RB_SELECT_READ, res_readreply, NULL);
} }
static struct DNSReply *make_dnsreply(struct reslist *request) static struct DNSReply *make_dnsreply(struct reslist *request)