Trying again - this will need ssld integration from me

[solanum.git] / src / res.c

diff --git a/src/res.c b/src/res.c
index 22f0993c833685d524215cef8dbb8c11dbd9fedf..e84e7a58f706a12342600372a75548665f294201 100644 (file)
--- a/src/res.c
+++ b/src/res.c
@@ -79,7 +79,7 @@ struct reslist
        char resend;            /* send flag. 0 == dont resend */
        time_t sentat;
        time_t timeout;
-       struct irc_sockaddr_storage addr;
+       struct rb_sockaddr_storage addr;
        char *name;
        struct DNSQuery *query; /* query callback for this request */
 };
@@ -90,7 +90,7 @@ 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 void do_query_name(struct DNSQuery *query, const char *name, struct reslist *request, int);
-static void do_query_number(struct DNSQuery *query, const struct irc_sockaddr_storage *,
+static void do_query_number(struct DNSQuery *query, const struct rb_sockaddr_storage *,
                            struct reslist *request);
 static void query_name(struct reslist *request);
 static int send_res_msg(const char *buf, int len, int count);
@@ -100,7 +100,7 @@ static int proc_answer(struct reslist *request, HEADER * header, char *, char *)
 static struct reslist *find_id(int id);
 static struct DNSReply *make_dnsreply(struct reslist *request);
 
-extern struct irc_sockaddr_storage irc_nsaddr_list[IRCD_MAXNS];
+extern struct rb_sockaddr_storage irc_nsaddr_list[IRCD_MAXNS];
 extern int irc_nscount;
 extern char irc_domain[HOSTLEN + 1];
 
@@ -116,7 +116,7 @@ extern char irc_domain[HOSTLEN + 1];
  *      paul vixie, 29may94
  *      revised for ircd, cryogen(stu) may03
  */
-static int res_ourserver(const struct irc_sockaddr_storage *inp)
+static int res_ourserver(const struct rb_sockaddr_storage *inp)
 {
 #ifdef IPV6
        struct sockaddr_in6 *v6;
@@ -128,7 +128,7 @@ static int res_ourserver(const struct irc_sockaddr_storage *inp)
 
        for (ns = 0; ns < irc_nscount; ns++)
        {
-               const struct irc_sockaddr_storage *srv = &irc_nsaddr_list[ns];
+               const struct rb_sockaddr_storage *srv = &irc_nsaddr_list[ns];
 #ifdef IPV6
                v6 = (struct sockaddr_in6 *)srv;
 #endif
@@ -212,7 +212,7 @@ static time_t timeout_query_list(time_t now)
  */
 static void timeout_resolver(void *notused)
 {
-       timeout_query_list(CurrentTime);
+       timeout_query_list(rb_current_time());
 }
 
 /*
@@ -231,7 +231,7 @@ static void start_resolver(void)
 
                /* At the moment, the resolver FD data is global .. */
                rb_setselect(res_fd, FDLIST_NONE, COMM_SELECT_READ, res_readreply, NULL, 0);
-               eventAdd("timeout_resolver", timeout_resolver, NULL, 1);
+               rb_event_add("timeout_resolver", timeout_resolver, NULL, 1);
        }
 }
 
@@ -241,7 +241,7 @@ static void start_resolver(void)
 void init_resolver(void)
 {
 #ifdef HAVE_SRAND48
-       srand48(CurrentTime);
+       srand48(rb_current_time());
 #endif
        start_resolver();
 }
@@ -287,8 +287,8 @@ void add_local_domain(char *hname, size_t size)
 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);
 }
 
 /*
@@ -296,9 +296,9 @@ static void rem_request(struct reslist *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. */
@@ -392,7 +392,7 @@ void gethost_byname_type(const char *name, struct DNSQuery *query, int type)
 /*
  * gethost_byaddr - get host name from address
  */
-void gethost_byaddr(const struct irc_sockaddr_storage *addr, struct DNSQuery *query)
+void gethost_byaddr(const struct rb_sockaddr_storage *addr, struct DNSQuery *query)
 {
        do_query_number(query, addr, NULL);
 }
@@ -411,7 +411,7 @@ static void do_query_name(struct DNSQuery *query, const char *name, struct resli
        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;
        }
@@ -424,7 +424,7 @@ static void do_query_name(struct DNSQuery *query, const char *name, struct resli
 /*
  * do_query_number - Use this to do reverse IP# lookups.
  */
-static void do_query_number(struct DNSQuery *query, const struct irc_sockaddr_storage *addr,
+static void do_query_number(struct DNSQuery *query, const struct rb_sockaddr_storage *addr,
                            struct reslist *request)
 {
        const unsigned char *cp;
@@ -432,8 +432,8 @@ static void do_query_number(struct DNSQuery *query, const struct irc_sockaddr_st
        if (request == NULL)
        {
                request = make_request(query);
-               memcpy(&request->addr, addr, sizeof(struct irc_sockaddr_storage));
-               request->name = (char *)MyMalloc(HOSTLEN + 1);
+               memcpy(&request->addr, addr, sizeof(struct rb_sockaddr_storage));
+               request->name = (char *)rb_malloc(HOSTLEN + 1);
        }
 
        if (addr->ss_family == AF_INET)
@@ -734,8 +734,8 @@ static void res_readreply(int fd, void *data)
        struct DNSReply *reply = NULL;
        int rc;
        int answer_count;
-       socklen_t len = sizeof(struct irc_sockaddr_storage);
-       struct irc_sockaddr_storage lsin;
+       socklen_t len = sizeof(struct rb_sockaddr_storage);
+       struct rb_sockaddr_storage lsin;
 
        rc = recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *)&lsin, &len);
 
@@ -831,7 +831,7 @@ static void res_readreply(int fd, void *data)
                         */
                        reply = make_dnsreply(request);
                        (*request->query->callback) (request->query->ptr, reply);
-                       MyFree(reply);
+                       rb_free(reply);
                        rem_request(request);
                }
        }
@@ -848,7 +848,7 @@ static struct DNSReply *make_dnsreply(struct reslist *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));