X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/cc200171d7c40be3b204460f9c14d5d37e771866..9f6bbe3cf9c786c5089bfd605315aed5268e8974:/src/res.c

diff --git a/src/res.c b/src/res.c
index 22f0993..fff5abc 100644
--- a/src/res.c
+++ b/src/res.c
@@ -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());
 }
 
 /*
@@ -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. */
@@ -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;
 	}
@@ -433,7 +433,7 @@ static void do_query_number(struct DNSQuery *query, const struct irc_sockaddr_st
 	{
 		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)
@@ -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));