#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"
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;
*/
static void timeout_resolver(void *notused)
{
- timeout_query_list(CurrentTime);
+ timeout_query_list(rb_current_time());
}
/*
void init_resolver(void)
{
#ifdef HAVE_SRAND48
- srand48(CurrentTime);
+ srand48(rb_current_time());
#endif
start_resolver();
}
static void rem_request(struct reslist *request)
{
rb_dlinkDelete(&request->node, &request_list);
- MyFree(request->name);
- MyFree(request);
+ rb_free(request->name);
+ rb_free(request);
}
/*
*/
static struct reslist *make_request(struct DNSQuery *query)
{
- struct reslist *request = MyMalloc(sizeof(struct reslist));
+ struct reslist *request = rb_malloc(sizeof(struct reslist));
- request->sentat = CurrentTime;
+ request->sentat = rb_current_time();
request->retries = 3;
request->resend = 1;
request->timeout = 4; /* start at 4 and exponential inc. */
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)
{
rb_dlink_node *ptr;
struct reslist *request;
- DLINK_FOREACH(ptr, request_list.head)
+ RB_DLINK_FOREACH(ptr, request_list.head)
{
request = ptr->data;
if (request == NULL)
{
request = make_request(query);
- request->name = (char *)MyMalloc(strlen(host_name) + 1);
+ request->name = (char *)rb_malloc(strlen(host_name) + 1);
strcpy(request->name, host_name);
request->state = REQ_A;
}
{
request = make_request(query);
memcpy(&request->addr, addr, sizeof(struct irc_sockaddr_storage));
- request->name = (char *)MyMalloc(HOSTLEN + 1);
+ request->name = (char *)rb_malloc(HOSTLEN + 1);
}
if (addr->ss_family == AF_INET)
*/
reply = make_dnsreply(request);
(*request->query->callback) (request->query->ptr, reply);
- MyFree(reply);
+ rb_free(reply);
rem_request(request);
}
}
struct DNSReply *cp;
s_assert(request != 0);
- cp = (struct DNSReply *)MyMalloc(sizeof(struct DNSReply));
+ cp = (struct DNSReply *)rb_malloc(sizeof(struct DNSReply));
cp->h_name = request->name;
memcpy(&cp->addr, &request->addr, sizeof(cp->addr));