X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/cc200171d7c40be3b204460f9c14d5d37e771866..6e9b4415cce8808ad39f90612f0218274f3cb1c1:/src/reject.c?ds=sidebyside

diff --git a/src/reject.c b/src/reject.c
index 47271b2..a437449 100644
--- a/src/reject.c
+++ b/src/reject.c
@@ -98,11 +98,11 @@ reject_expires(void *unused)
 		pnode = ptr->data;
 		rdata = pnode->data;		
 
-		if(rdata->time + ConfigFileEntry.reject_duration > CurrentTime)
+		if(rdata->time + ConfigFileEntry.reject_duration > rb_current_time())
 			continue;
 
 		rb_dlinkDelete(ptr, &reject_list);
-		MyFree(rdata);
+		rb_free(rdata);
 		patricia_remove(reject_tree, pnode);
 	}
 }
@@ -137,7 +137,7 @@ add_reject(struct Client *client_p, const char *mask1, const char *mask2)
 	if((pnode = match_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip)) != NULL)
 	{
 		rdata = pnode->data;
-		rdata->time = CurrentTime;
+		rdata->time = rb_current_time();
 		rdata->count++;
 	}
 	else
@@ -148,9 +148,9 @@ add_reject(struct Client *client_p, const char *mask1, const char *mask2)
 			bitlen = 128;
 #endif
 		pnode = make_and_lookup_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip, bitlen);
-		pnode->data = rdata = MyMalloc(sizeof(struct reject_data));
+		pnode->data = rdata = rb_malloc(sizeof(struct reject_data));
 		rb_dlinkAddTail(pnode, &rdata->rnode, &reject_list);
-		rdata->time = CurrentTime;
+		rdata->time = rb_current_time();
 		rdata->count = 1;
 	}
 	rdata->mask_hashv = hashv;
@@ -172,7 +172,7 @@ check_reject(struct Client *client_p)
 	{
 		rdata = pnode->data;
 
-		rdata->time = CurrentTime;
+		rdata->time = rb_current_time();
 		if(rdata->count > ConfigFileEntry.reject_after_count)
 		{
 			ServerStats->is_rej++;
@@ -199,7 +199,7 @@ flush_reject(void)
 		pnode = ptr->data;
 		rdata = pnode->data;
 		rb_dlinkDelete(ptr, &reject_list);
-		MyFree(rdata);
+		rb_free(rdata);
 		patricia_remove(reject_tree, pnode);
 	}
 }
@@ -218,7 +218,7 @@ remove_reject_ip(const char *ip)
 	{
 		struct reject_data *rdata = pnode->data;
 		rb_dlinkDelete(&rdata->rnode, &reject_list);
-		MyFree(rdata);
+		rb_free(rdata);
 		patricia_remove(reject_tree, pnode);
 		return 1;
 	}
@@ -246,7 +246,7 @@ remove_reject_mask(const char *mask1, const char *mask2)
 		if (rdata->mask_hashv == hashv)
 		{
 			rb_dlinkDelete(ptr, &reject_list);
-			MyFree(rdata);
+			rb_free(rdata);
 			patricia_remove(reject_tree, pnode);
 			n++;
 		}