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

res.c is ported to libratbox :)

Browse source
This commit is contained in:
William Pitcock 2008-04-02 12:57:14 -05:00
parent 70c365cb35
commit 0f6d6f3ddf
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/res.c
View file

@ -84,7 +84,7 @@ struct reslist
struct DNSQuery *query; /* query callback for this request */ struct DNSQuery *query; /* query callback for this request */
}; };
static int res_fd; static rb_fde_t *res_fd;
static rb_dlink_list request_list = { NULL, NULL, 0 }; static rb_dlink_list request_list = { NULL, NULL, 0 };
static void rem_request(struct reslist *request); static void rem_request(struct reslist *request);
@ -215,6 +215,8 @@ static void timeout_resolver(void *notused)
timeout_query_list(rb_current_time()); timeout_query_list(rb_current_time());
} }
static struct ev_entry *timeout_resolver_ev = NULL;
/* /*
* start_resolver - do everything we need to read the resolv.conf file * start_resolver - do everything we need to read the resolv.conf file
* and initialize the resolver file descriptor if needed * and initialize the resolver file descriptor if needed
@ -226,12 +228,12 @@ static void start_resolver(void)
if (res_fd <= 0) /* there isn't any such thing as fd 0, that's just a myth. */ if (res_fd <= 0) /* there isn't any such thing as fd 0, that's just a myth. */
{ {
if ((res_fd = rb_socket(irc_nsaddr_list[0].ss_family, SOCK_DGRAM, 0, if ((res_fd = rb_socket(irc_nsaddr_list[0].ss_family, SOCK_DGRAM, 0,
"UDP resolver socket")) == -1) "UDP resolver socket")) == NULL)
return; return;
/* At the moment, the resolver FD data is global .. */ /* At the moment, the resolver FD data is global .. */
rb_setselect(res_fd, FDLIST_NONE, COMM_SELECT_READ, res_readreply, NULL, 0); rb_setselect(res_fd, RB_SELECT_READ, res_readreply, NULL);
rb_event_add("timeout_resolver", timeout_resolver, NULL, 1); timeout_resolver_ev = rb_event_add("timeout_resolver", timeout_resolver, NULL, 1);
} }
} }
@ -252,8 +254,8 @@ void init_resolver(void)
void restart_resolver(void) void restart_resolver(void)
{ {
rb_close(res_fd); rb_close(res_fd);
res_fd = -1; res_fd = NULL;
eventDelete(timeout_resolver, NULL); /* -ddosen */ rb_event_delete(timeout_resolver_ev); /* -ddosen */
start_resolver(); start_resolver();
} }
@ -351,9 +353,9 @@ static int send_res_msg(const char *msg, int len, int rcount)
for (i = 0; sent < max_queries && i < irc_nscount; i++) for (i = 0; sent < max_queries && i < irc_nscount; i++)
{ {
if (sendto(res_fd, msg, len, 0, if (sendto(rb_get_fd(res_fd), msg, len, 0,
(struct sockaddr *)&(irc_nsaddr_list[i]), (struct sockaddr *)&(irc_nsaddr_list[i]),
GET_SS_LEN(irc_nsaddr_list[i])) == len) GET_SS_LEN(&irc_nsaddr_list[i])) == len)
++sent; ++sent;
} }
@ -651,7 +653,7 @@ static int proc_answer(struct reslist *request, HEADER * header, char *buf, char
if (rd_length != sizeof(struct in_addr)) if (rd_length != sizeof(struct in_addr))
return (0); return (0);
v4 = (struct sockaddr_in *)&request->addr; v4 = (struct sockaddr_in *)&request->addr;
SET_SS_LEN(request->addr, sizeof(struct sockaddr_in)); SET_SS_LEN(&request->addr, sizeof(struct sockaddr_in));
v4->sin_family = AF_INET; v4->sin_family = AF_INET;
memcpy(&v4->sin_addr, current, sizeof(struct in_addr)); memcpy(&v4->sin_addr, current, sizeof(struct in_addr));
return (1); return (1);
@ -662,7 +664,7 @@ static int proc_answer(struct reslist *request, HEADER * header, char *buf, char
return (0); return (0);
if (rd_length != sizeof(struct in6_addr)) if (rd_length != sizeof(struct in6_addr))
return (0); return (0);
SET_SS_LEN(request->addr, sizeof(struct sockaddr_in6)); SET_SS_LEN(&request->addr, sizeof(struct sockaddr_in6));
v6 = (struct sockaddr_in6 *)&request->addr; v6 = (struct sockaddr_in6 *)&request->addr;
v6->sin6_family = AF_INET6; v6->sin6_family = AF_INET6;
memcpy(&v6->sin6_addr, current, sizeof(struct in6_addr)); memcpy(&v6->sin6_addr, current, sizeof(struct in6_addr));
@ -718,7 +720,7 @@ 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_readreply - read a dns reply from the nameserver and process it.
*/ */
static void res_readreply(int fd, void *data) static void res_readreply(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
@ -737,12 +739,12 @@ static void res_readreply(int fd, void *data)
socklen_t len = sizeof(struct rb_sockaddr_storage); socklen_t len = sizeof(struct rb_sockaddr_storage);
struct rb_sockaddr_storage lsin; struct rb_sockaddr_storage lsin;
rc = recvfrom(fd, 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 /* Re-schedule a read *after* recvfrom, or we'll be registering
* interest where it'll instantly be ready for read :-) -- adrian * interest where it'll instantly be ready for read :-) -- adrian
*/ */
rb_setselect(fd, FDLIST_NONE, COMM_SELECT_READ, res_readreply, NULL, 0); rb_setselect(F, RB_SELECT_READ, res_readreply, NULL);
/* Better to cast the sizeof instead of rc */ /* Better to cast the sizeof instead of rc */
if (rc <= (int)(sizeof(HEADER))) if (rc <= (int)(sizeof(HEADER)))
return; return;