#include "ircd_defs.h"
#include "common.h"
#include "ircd.h"
-#include "commio.h"
#include "res.h"
#include "reslib.h"
-#include "tools.h"
-#include "event.h"
#include "irc_string.h"
#include "sprintf_irc.h"
#include "numeric.h"
struct reslist
{
- dlink_node node;
+ rb_dlink_node node;
int id;
int sent; /* number of requests sent */
request_state state; /* State the resolver machine is in */
};
static int res_fd;
-static dlink_list request_list = { NULL, NULL, 0 };
+static rb_dlink_list request_list = { NULL, NULL, 0 };
static void rem_request(struct reslist *request);
static struct reslist *make_request(struct DNSQuery *query);
*/
static time_t timeout_query_list(time_t now)
{
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
struct reslist *request;
time_t next_time = 0;
time_t timeout = 0;
- DLINK_FOREACH_SAFE(ptr, next_ptr, request_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, request_list.head)
{
request = ptr->data;
timeout = request->sentat + request->timeout;
if (res_fd <= 0) /* there isn't any such thing as fd 0, that's just a myth. */
{
- if ((res_fd = comm_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)
return;
/* At the moment, the resolver FD data is global .. */
- comm_setselect(res_fd, FDLIST_NONE, COMM_SELECT_READ, res_readreply, NULL, 0);
+ rb_setselect(res_fd, FDLIST_NONE, COMM_SELECT_READ, res_readreply, NULL, 0);
eventAdd("timeout_resolver", timeout_resolver, NULL, 1);
}
}
*/
void restart_resolver(void)
{
- comm_close(res_fd);
+ rb_close(res_fd);
res_fd = -1;
eventDelete(timeout_resolver, NULL); /* -ddosen */
start_resolver();
*/
static void rem_request(struct reslist *request)
{
- dlinkDelete(&request->node, &request_list);
- MyFree(request->name);
- MyFree(request);
+ rb_dlinkDelete(&request->node, &request_list);
+ rb_free(request->name);
+ rb_free(request);
}
/*
request->query = query;
request->state = REQ_IDLE;
- dlinkAdd(request, &request->node, &request_list);
+ rb_dlinkAdd(request, &request->node, &request_list);
return request;
}
*/
void delete_resolver_queries(const struct DNSQuery *query)
{
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
struct reslist *request;
- DLINK_FOREACH_SAFE(ptr, next_ptr, request_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, request_list.head)
{
if ((request = ptr->data) != NULL)
{
*/
static struct reslist *find_id(int id)
{
- dlink_node *ptr;
+ rb_dlink_node *ptr;
struct reslist *request;
- DLINK_FOREACH(ptr, request_list.head)
+ RB_DLINK_FOREACH(ptr, request_list.head)
{
request = ptr->data;
struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
cp = (const unsigned char *)&v4->sin_addr.s_addr;
- ircsprintf(request->queryname, "%u.%u.%u.%u.in-addr.arpa", (unsigned int)(cp[3]),
+ rb_sprintf(request->queryname, "%u.%u.%u.%u.in-addr.arpa", (unsigned int)(cp[3]),
(unsigned int)(cp[2]), (unsigned int)(cp[1]), (unsigned int)(cp[0]));
}
#ifdef IPV6
/* Re-schedule a read *after* recvfrom, or we'll be registering
* interest where it'll instantly be ready for read :-) -- adrian
*/
- comm_setselect(fd, FDLIST_NONE, COMM_SELECT_READ, res_readreply, NULL, 0);
+ rb_setselect(fd, FDLIST_NONE, COMM_SELECT_READ, res_readreply, NULL, 0);
/* Better to cast the sizeof instead of rc */
if (rc <= (int)(sizeof(HEADER)))
return;
*/
reply = make_dnsreply(request);
(*request->query->callback) (request->query->ptr, reply);
- MyFree(reply);
+ rb_free(reply);
rem_request(request);
}
}