X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/9f6bbe3cf9c786c5089bfd605315aed5268e8974..1d39b466d4ddd974674c9397589d45935c746ed0:/src/client.c

diff --git a/src/client.c b/src/client.c
index eee6db1..b45acb2 100644
--- a/src/client.c
+++ b/src/client.c
@@ -40,7 +40,7 @@
 #include "s_auth.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "send.h"
@@ -73,9 +73,10 @@ static int qs_server(struct Client *, struct Client *, struct Client *, const ch
 
 static EVH check_pings;
 
-extern BlockHeap *client_heap;
-extern BlockHeap *lclient_heap;
-extern BlockHeap *pclient_heap;
+extern rb_bh *client_heap;
+extern rb_bh *lclient_heap;
+extern rb_bh *pclient_heap;
+static rb_bh *away_heap = NULL;
 
 extern char current_uid[IDLEN];
 
@@ -117,12 +118,15 @@ init_client(void)
 	 * start off the check ping event ..  -- adrian
 	 * Every 30 seconds is plenty -- db
 	 */
-	client_heap = BlockHeapCreate(sizeof(struct Client), CLIENT_HEAP_SIZE);
-	lclient_heap = BlockHeapCreate(sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
-	pclient_heap = BlockHeapCreate(sizeof(struct PreClient), PCLIENT_HEAP_SIZE);
+	client_heap = rb_bh_create(sizeof(struct Client), CLIENT_HEAP_SIZE, "client_heap");
+	lclient_heap = rb_bh_create(sizeof(struct LocalUser), LCLIENT_HEAP_SIZE, "lclient_heap");
+	pclient_heap = rb_bh_create(sizeof(struct PreClient), PCLIENT_HEAP_SIZE, "pclient_heap");
+	away_heap = rb_bh_create(AWAYLEN, AWAY_HEAP_SIZE, "away_heap");
+
 	rb_event_addish("check_pings", check_pings, NULL, 30);
 	rb_event_addish("free_exited_clients", &free_exited_clients, NULL, 4);
 	rb_event_addish("exit_aborted_clients", exit_aborted_clients, NULL, 1);
+	rb_event_add("flood_recalc", flood_recalc, NULL, 1);
 
 	nd_dict = irc_dictionary_create(irccmp);
 }
@@ -144,22 +148,22 @@ make_client(struct Client *from)
 	struct Client *client_p = NULL;
 	struct LocalUser *localClient;
 
-	client_p = BlockHeapAlloc(client_heap);
+	client_p = rb_bh_alloc(client_heap);
 
 	if(from == NULL)
 	{
 		client_p->from = client_p;	/* 'from' of local client is self! */
 
-		localClient = (struct LocalUser *) BlockHeapAlloc(lclient_heap);
+		localClient = (struct LocalUser *) rb_bh_alloc(lclient_heap);
 		SetMyConnect(client_p);
 		client_p->localClient = localClient;
 
 		client_p->localClient->lasttime = client_p->localClient->firsttime = rb_current_time();
 
 		client_p->localClient->F = NULL;
-		client_p->localClient->ctrlfd = -1;
+		client_p->localClient->ctrlF = NULL;
 
-		client_p->preClient = (struct PreClient *) BlockHeapAlloc(pclient_heap);
+		client_p->preClient = (struct PreClient *) rb_bh_alloc(pclient_heap);
 
 		/* as good a place as any... */
 		rb_dlinkAdd(client_p, &client_p->localClient->tnode, &unknown_list);
@@ -191,7 +195,7 @@ free_pre_client(struct Client *client_p)
 	if (blptr != NULL)
 		unref_blacklist(blptr);
 	abort_blacklist_queries(client_p);
-	BlockHeapFree(pclient_heap, client_p->preClient);
+	rb_bh_free(pclient_heap, client_p->preClient);
 	client_p->preClient = NULL;
 }
 
@@ -231,7 +235,7 @@ free_local_client(struct Client *client_p)
 	rb_free(client_p->localClient->opername);
 	rb_free(client_p->localClient->mangledhost);
 
-	BlockHeapFree(lclient_heap, client_p->localClient);
+	rb_bh_free(lclient_heap, client_p->localClient);
 	client_p->localClient = NULL;
 }
 
@@ -242,7 +246,7 @@ free_client(struct Client *client_p)
 	s_assert(&me != client_p);
 	free_local_client(client_p);
 	free_pre_client(client_p);
-	BlockHeapFree(client_heap, client_p);
+	rb_bh_free(client_heap, client_p);
 }
 
 /*
@@ -1398,6 +1402,11 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
 		  const char *comment)
 {
 	delete_auth_queries(source_p);
+	if (source_p->localClient->dnsquery)
+	{
+		delete_resolver_queries(source_p->localClient->dnsquery);
+		rb_free(source_p->localClient->dnsquery);
+	}
 	del_unknown_ip(source_p);
 	rb_dlinkDelete(&source_p->localClient->tnode, &unknown_list);
 
@@ -1553,10 +1562,10 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 
 	sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s was connected"
 			     " for %ld seconds.  %d/%d sendK/recvK.",
-			     source_p->name, rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
+			     source_p->name, (long) rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
 
 	ilog(L_SERVER, "%s was connected for %ld seconds.  %d/%d sendK/recvK.",
-	     source_p->name, rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
+	     source_p->name, (long) rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
         
 	if(has_id(source_p))
 		del_from_id_hash(source_p->id, source_p);
@@ -1709,8 +1718,8 @@ void
 count_local_client_memory(size_t * count, size_t * local_client_memory_used)
 {
 	size_t lusage;
-	BlockHeapUsage(lclient_heap, count, NULL, &lusage);
-	*local_client_memory_used = lusage + (*count * (sizeof(MemBlock) + sizeof(struct Client)));
+	rb_bh_usage(lclient_heap, count, NULL, &lusage, NULL);
+	*local_client_memory_used = lusage + (*count * (sizeof(void *) + sizeof(struct Client)));
 }
 
 /*
@@ -1720,10 +1729,10 @@ void
 count_remote_client_memory(size_t * count, size_t * remote_client_memory_used)
 {
 	size_t lcount, rcount;
-	BlockHeapUsage(lclient_heap, &lcount, NULL, NULL);
-	BlockHeapUsage(client_heap, &rcount, NULL, NULL);
+	rb_bh_usage(lclient_heap, &lcount, NULL, NULL, NULL);
+	rb_bh_usage(client_heap, &rcount, NULL, NULL, NULL);
 	*count = rcount - lcount;
-	*remote_client_memory_used = *count * (sizeof(MemBlock) + sizeof(struct Client));
+	*remote_client_memory_used = *count * (sizeof(void *) + sizeof(struct Client));
 }
 
 
@@ -1841,13 +1850,13 @@ show_ip_conf(struct ConfItem *aconf, struct Client *source_p)
  * side effects - Creates a block heap for struct Users
  *
  */
-static BlockHeap *user_heap;
+static rb_bh *user_heap;
 void
 initUser(void)
 {
-	user_heap = BlockHeapCreate(sizeof(struct User), USER_HEAP_SIZE);
+	user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
 	if(!user_heap)
-		outofmemory();
+		rb_outofmemory();
 }
 
 /*
@@ -1866,7 +1875,7 @@ make_user(struct Client *client_p)
 	user = client_p->user;
 	if(!user)
 	{
-		user = (struct User *) BlockHeapAlloc(user_heap);
+		user = (struct User *) rb_bh_alloc(user_heap);
 		user->refcnt = 1;
 		client_p->user = user;
 	}
@@ -1906,6 +1915,8 @@ make_server(struct Client *client_p)
 void
 free_user(struct User *user, struct Client *client_p)
 {
+	free_away(client_p);
+
 	if(--user->refcnt <= 0)
 	{
 		if(user->away)
@@ -1932,25 +1943,25 @@ free_user(struct User *user, struct Client *client_p)
 			s_assert(!user->channel.head);
 		}
 
-		BlockHeapFree(user_heap, user);
+		rb_bh_free(user_heap, user);
 	}
 }
 
-void
-allocate_away(struct Client *client_p)
-{
-	if(client_p->user->away == NULL)
-		client_p->user->away = rb_bh_alloc(away_heap);	
-}
-
-
-void
-free_away(struct Client *client_p)
-{
-	if(client_p->user->away != NULL) {
-		rb_bh_free(away_heap, client_p->user->away);
-		client_p->user->away = NULL;
-	}
+void
+allocate_away(struct Client *client_p)
+{
+	if(client_p->user->away == NULL)
+		client_p->user->away = rb_bh_alloc(away_heap);	
+}
+
+
+void
+free_away(struct Client *client_p)
+{
+	if(client_p->user != NULL && client_p->user->away != NULL) {
+		rb_bh_free(away_heap, client_p->user->away);
+		client_p->user->away = NULL;
+	}
 }
 
 void
@@ -2021,21 +2032,21 @@ close_connection(struct Client *client_p)
 	{
 		struct server_conf *server_p;
 
-		ServerStats->is_sv++;
-		ServerStats->is_sbs += client_p->localClient->sendB;
-		ServerStats->is_sbr += client_p->localClient->receiveB;
-		ServerStats->is_sks += client_p->localClient->sendK;
-		ServerStats->is_skr += client_p->localClient->receiveK;
-		ServerStats->is_sti += rb_current_time() - client_p->localClient->firsttime;
-		if(ServerStats->is_sbs > 2047)
+		ServerStats.is_sv++;
+		ServerStats.is_sbs += client_p->localClient->sendB;
+		ServerStats.is_sbr += client_p->localClient->receiveB;
+		ServerStats.is_sks += client_p->localClient->sendK;
+		ServerStats.is_skr += client_p->localClient->receiveK;
+		ServerStats.is_sti += rb_current_time() - client_p->localClient->firsttime;
+		if(ServerStats.is_sbs > 2047)
 		{
-			ServerStats->is_sks += (ServerStats->is_sbs >> 10);
-			ServerStats->is_sbs &= 0x3ff;
+			ServerStats.is_sks += (ServerStats.is_sbs >> 10);
+			ServerStats.is_sbs &= 0x3ff;
 		}
-		if(ServerStats->is_sbr > 2047)
+		if(ServerStats.is_sbr > 2047)
 		{
-			ServerStats->is_skr += (ServerStats->is_sbr >> 10);
-			ServerStats->is_sbr &= 0x3ff;
+			ServerStats.is_skr += (ServerStats.is_sbr >> 10);
+			ServerStats.is_sbr &= 0x3ff;
 		}
 
 		/*
@@ -2059,25 +2070,25 @@ close_connection(struct Client *client_p)
 	}
 	else if(IsClient(client_p))
 	{
-		ServerStats->is_cl++;
-		ServerStats->is_cbs += client_p->localClient->sendB;
-		ServerStats->is_cbr += client_p->localClient->receiveB;
-		ServerStats->is_cks += client_p->localClient->sendK;
-		ServerStats->is_ckr += client_p->localClient->receiveK;
-		ServerStats->is_cti += rb_current_time() - client_p->localClient->firsttime;
-		if(ServerStats->is_cbs > 2047)
+		ServerStats.is_cl++;
+		ServerStats.is_cbs += client_p->localClient->sendB;
+		ServerStats.is_cbr += client_p->localClient->receiveB;
+		ServerStats.is_cks += client_p->localClient->sendK;
+		ServerStats.is_ckr += client_p->localClient->receiveK;
+		ServerStats.is_cti += rb_current_time() - client_p->localClient->firsttime;
+		if(ServerStats.is_cbs > 2047)
 		{
-			ServerStats->is_cks += (ServerStats->is_cbs >> 10);
-			ServerStats->is_cbs &= 0x3ff;
+			ServerStats.is_cks += (ServerStats.is_cbs >> 10);
+			ServerStats.is_cbs &= 0x3ff;
 		}
-		if(ServerStats->is_cbr > 2047)
+		if(ServerStats.is_cbr > 2047)
 		{
-			ServerStats->is_ckr += (ServerStats->is_cbr >> 10);
-			ServerStats->is_cbr &= 0x3ff;
+			ServerStats.is_ckr += (ServerStats.is_cbr >> 10);
+			ServerStats.is_cbr &= 0x3ff;
 		}
 	}
 	else
-		ServerStats->is_ni++;
+		ServerStats.is_ni++;
 
 	if(client_p->localClient->F)
 	{
@@ -2089,10 +2100,10 @@ close_connection(struct Client *client_p)
 		client_p->localClient->F = NULL;
 	}
 
-	if(-1 < client_p->localClient->ctrlfd)
+	if(client_p->localClient->ctrlF)
 	{
-		rb_close(client_p->localClient->ctrlfd);
-		client_p->localClient->ctrlfd = -1;
+		rb_close(client_p->localClient->ctrlF);
+		client_p->localClient->ctrlF = NULL;
 	}
 
 	rb_linebuf_donebuf(&client_p->localClient->buf_sendq);