X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/af81d5a0b09446188fd6f9c292b51519f2c1cedd..d3455e2c7e2f9040e1b7628d9cf52b26a24dcefc:/src/client.c

diff --git a/src/client.c b/src/client.c
index 80b35c6..a34b9e8 100644
--- a/src/client.c
+++ b/src/client.c
@@ -27,11 +27,9 @@
 #include "stdinc.h"
 #include "config.h"
 
-#include "tools.h"
 #include "client.h"
 #include "class.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
@@ -40,20 +38,16 @@
 #include "numeric.h"
 #include "packet.h"
 #include "s_auth.h"
-#include "commio.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"
 #include "whowas.h"
 #include "s_user.h"
-#include "linebuf.h"
 #include "hash.h"
-#include "memory.h"
 #include "hostmask.h"
-#include "balloc.h"
 #include "listener.h"
 #include "hook.h"
 #include "msg.h"
@@ -79,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];
 
@@ -123,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);
-	eventAddIsh("check_pings", check_pings, NULL, 30);
-	eventAddIsh("free_exited_clients", &free_exited_clients, NULL, 4);
-	eventAddIsh("exit_aborted_clients", exit_aborted_clients, NULL, 1);
+	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);
 }
@@ -150,22 +148,21 @@ 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 = CurrentTime;
+		client_p->localClient->lasttime = client_p->localClient->firsttime = rb_current_time();
 
 		client_p->localClient->F = NULL;
-		client_p->localClient->ctrlfd = -1;
 
-		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);
@@ -197,7 +194,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;
 }
 
@@ -223,21 +220,21 @@ free_local_client(struct Client *client_p)
 	}
 
 	if(client_p->localClient->F)
-		rb_close(client_p->localClient->F->fd);
+		rb_close(client_p->localClient->F);
 
 	if(client_p->localClient->passwd)
 	{
 		memset(client_p->localClient->passwd, 0,
 			strlen(client_p->localClient->passwd));
-		MyFree(client_p->localClient->passwd);
+		rb_free(client_p->localClient->passwd);
 	}
 
-	MyFree(client_p->localClient->challenge);
-	MyFree(client_p->localClient->fullcaps);
-	MyFree(client_p->localClient->opername);
-	MyFree(client_p->localClient->mangledhost);
+	rb_free(client_p->localClient->challenge);
+	rb_free(client_p->localClient->fullcaps);
+	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;
 }
 
@@ -248,7 +245,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);
 }
 
 /*
@@ -300,7 +297,7 @@ check_pings_list(rb_dlink_list * list)
 	int ping = 0;		/* ping time value from client */
 	rb_dlink_node *ptr, *next_ptr;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
 	{
 		client_p = ptr->data;
 
@@ -309,13 +306,13 @@ check_pings_list(rb_dlink_list * list)
 
 		ping = get_client_ping(client_p);
 
-		if(ping < (CurrentTime - client_p->localClient->lasttime))
+		if(ping < (rb_current_time() - client_p->localClient->lasttime))
 		{
 			/*
 			 * If the client/server hasnt talked to us in 2*ping seconds
 			 * and it has a ping time, then close its connection.
 			 */
-			if(((CurrentTime - client_p->localClient->lasttime) >= (2 * ping)
+			if(((rb_current_time() - client_p->localClient->lasttime) >= (2 * ping)
 			    && (client_p->flags & FLAGS_PINGSENT)))
 			{
 				if(IsServer(client_p))
@@ -329,7 +326,7 @@ check_pings_list(rb_dlink_list * list)
 				}
 				(void) rb_snprintf(scratch, sizeof(scratch),
 						  "Ping timeout: %d seconds",
-						  (int) (CurrentTime - client_p->localClient->lasttime));
+						  (int) (rb_current_time() - client_p->localClient->lasttime));
 
 				exit_client(client_p, client_p, &me, scratch);
 				continue;
@@ -343,7 +340,7 @@ check_pings_list(rb_dlink_list * list)
 				 */
 				client_p->flags |= FLAGS_PINGSENT;
 				/* not nice but does the job */
-				client_p->localClient->lasttime = CurrentTime - ping;
+				client_p->localClient->lasttime = rb_current_time() - ping;
 				sendto_one(client_p, "PING :%s", me.name);
 			}
 		}
@@ -366,7 +363,7 @@ check_unknowns_list(rb_dlink_list * list)
 	struct Client *client_p;
 	int timeout;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
 	{
 		client_p = ptr->data;
 
@@ -379,7 +376,7 @@ check_unknowns_list(rb_dlink_list * list)
 		 */
 
 		timeout = IsAnyServer(client_p) ? ConfigFileEntry.connect_timeout : 30;
-		if((CurrentTime - client_p->localClient->firsttime) > timeout)
+		if((rb_current_time() - client_p->localClient->firsttime) > timeout)
 		{
 			if(IsAnyServer(client_p))
 			{
@@ -451,7 +448,7 @@ check_banned_lines(void)
 	struct ConfItem *aconf = NULL;
 	rb_dlink_node *ptr, *next_ptr;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
 	{
 		client_p = ptr->data;
 
@@ -539,7 +536,7 @@ check_banned_lines(void)
 	}
 
 	/* also check the unknowns list for new dlines */
-	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
 	{
 		client_p = ptr->data;
 
@@ -581,7 +578,7 @@ check_klines(void)
 	rb_dlink_node *ptr;
 	rb_dlink_node *next_ptr;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
 	{
 		client_p = ptr->data;
 
@@ -622,7 +619,7 @@ check_glines(void)
 	rb_dlink_node *ptr;
 	rb_dlink_node *next_ptr;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
 	{
 		client_p = ptr->data;
 
@@ -671,7 +668,7 @@ check_dlines(void)
 	rb_dlink_node *ptr;
 	rb_dlink_node *next_ptr;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
 	{
 		client_p = ptr->data;
 
@@ -693,7 +690,7 @@ check_dlines(void)
 	}
 
 	/* dlines need to be checked against unknowns too */
-	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
 	{
 		client_p = ptr->data;
 
@@ -721,7 +718,7 @@ check_xlines(void)
 	rb_dlink_node *ptr;
 	rb_dlink_node *next_ptr;
 
-	DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
 	{
 		client_p = ptr->data;
 
@@ -797,8 +794,8 @@ release_client_state(struct Client *client_p)
 		if(client_p->serv->user != NULL)
 			free_user(client_p->serv->user, client_p);
 		if(client_p->serv->fullcaps)
-			MyFree(client_p->serv->fullcaps);
-		MyFree(client_p->serv);
+			rb_free(client_p->serv->fullcaps);
+		rb_free(client_p->serv);
 	}
 }
 
@@ -1064,7 +1061,7 @@ free_exited_clients(void *unused)
 	rb_dlink_node *ptr, *next;
 	struct Client *target_p;
 
-	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
 	{
 		target_p = ptr->data;
 
@@ -1074,7 +1071,7 @@ free_exited_clients(void *unused)
 			rb_dlink_node *aptr;
 			int found = 0;
 
-			DLINK_FOREACH(aptr, abort_list.head)
+			RB_DLINK_FOREACH(aptr, abort_list.head)
 			{
 				abt = aptr->data;
 				if(abt->client == target_p)
@@ -1111,7 +1108,7 @@ free_exited_clients(void *unused)
 	}
 
 #ifdef DEBUG_EXITED_CLIENTS
-	DLINK_FOREACH_SAFE(ptr, next, dead_remote_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next, dead_remote_list.head)
 	{
 		target_p = ptr->data;
 
@@ -1156,12 +1153,12 @@ recurse_send_quits(struct Client *client_p, struct Client *source_p,
 	}
 	else
 	{
-		DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
+		RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
 		{
 			target_p = ptr->data;
 			sendto_one(to, ":%s QUIT :%s", target_p->name, comment1);
 		}
-		DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
+		RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
 		{
 			target_p = ptr->data;
 			recurse_send_quits(client_p, target_p, to, comment1, comment);
@@ -1194,7 +1191,7 @@ recurse_remove_clients(struct Client *source_p, const char *comment)
 	/* this is very ugly, but it saves cpu :P */
 	if(ConfigFileEntry.nick_delay > 0)
 	{
-		DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
+		RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
 		{
 			target_p = ptr->data;
 			target_p->flags |= FLAGS_KILLED;
@@ -1206,7 +1203,7 @@ recurse_remove_clients(struct Client *source_p, const char *comment)
 	}
 	else
 	{
-		DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
+		RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
 		{
 			target_p = ptr->data;
 			target_p->flags |= FLAGS_KILLED;
@@ -1216,7 +1213,7 @@ recurse_remove_clients(struct Client *source_p, const char *comment)
 		}
 	}	
 
-	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
+	RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
 	{
 		target_p = ptr->data;
 		recurse_remove_clients(target_p, comment);
@@ -1237,7 +1234,7 @@ remove_dependents(struct Client *client_p,
 	struct Client *to;
 	rb_dlink_node *ptr, *next;
 
-	DLINK_FOREACH_SAFE(ptr, next, serv_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next, serv_list.head)
 	{
 		to = ptr->data;
 
@@ -1256,7 +1253,7 @@ exit_aborted_clients(void *unused)
 {
 	struct abort_client *abt;
  	rb_dlink_node *ptr, *next;
- 	DLINK_FOREACH_SAFE(ptr, next, abort_list.head)
+ 	RB_DLINK_FOREACH_SAFE(ptr, next, abort_list.head)
  	{
  	 	abt = ptr->data;
 
@@ -1289,7 +1286,7 @@ exit_aborted_clients(void *unused)
 		 */
 		abt->client->flags &= ~FLAGS_CLOSING;
  	 	exit_client(abt->client, abt->client, &me, abt->notice);
- 	 	MyFree(abt);
+ 	 	rb_free(abt);
  	}
 }
 
@@ -1307,7 +1304,7 @@ dead_link(struct Client *client_p)
 	if(IsDead(client_p) || IsClosing(client_p) || IsMe(client_p))
 		return;
 
-	abt = (struct abort_client *) MyMalloc(sizeof(struct abort_client));
+	abt = (struct abort_client *) rb_malloc(sizeof(struct abort_client));
 
 	if(client_p->flags & FLAGS_SENDQEX)
 		strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
@@ -1342,7 +1339,7 @@ exit_generic_client(struct Client *client_p, struct Client *source_p, struct Cli
 	s_assert(source_p->user->channel.head == NULL);
 
 	/* Clean up invitefield */
-	DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->user->invited.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->user->invited.head)
 	{
 		del_invite(ptr->data, source_p);
 	}
@@ -1404,7 +1401,6 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
 		  const char *comment)
 {
 	delete_auth_queries(source_p);
-	client_flush_input(source_p);
 	del_unknown_ip(source_p);
 	rb_dlinkDelete(&source_p->localClient->tnode, &unknown_list);
 
@@ -1560,10 +1556,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, CurrentTime - 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, CurrentTime - 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);
@@ -1592,7 +1588,6 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien
 	clear_monitor(source_p);
 
 	s_assert(IsPerson(source_p));
-	client_flush_input(source_p);
 	rb_dlinkDelete(&source_p->localClient->tnode, &lclient_list);
 	rb_dlinkDelete(&source_p->lnode, &me.serv->users);
 
@@ -1611,10 +1606,10 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien
                         show_ip(NULL, source_p) ? source_p->sockhost : "255.255.255.255",
 			comment);
 
-	on_for = CurrentTime - source_p->localClient->firsttime;
+	on_for = rb_current_time() - source_p->localClient->firsttime;
 
 	ilog(L_USER, "%s (%3lu:%02lu:%02lu): %s!%s@%s %d/%d",
-		myctime(CurrentTime), on_for / 3600,
+		myctime(rb_current_time()), on_for / 3600,
 		(on_for % 3600) / 60, on_for % 60,
 		source_p->name, source_p->username, source_p->host,
 		source_p->localClient->sendK, source_p->localClient->receiveK);
@@ -1717,8 +1712,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)));
 }
 
 /*
@@ -1728,10 +1723,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));
 }
 
 
@@ -1772,7 +1767,7 @@ del_all_accepts(struct Client *client_p)
 		/* clear this clients accept list, and remove them from
 		 * everyones on_accept_list
 		 */
-		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->allow_list.head)
+		RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->allow_list.head)
 		{
 			target_p = ptr->data;
 			rb_dlinkFindDestroy(client_p, &target_p->on_allow_list);
@@ -1781,7 +1776,7 @@ del_all_accepts(struct Client *client_p)
 	}
 
 	/* remove this client from everyones accept list */
-	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
 	{
 		target_p = ptr->data;
 		rb_dlinkFindDestroy(client_p, &target_p->localClient->allow_list);
@@ -1849,13 +1844,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();
 }
 
 /*
@@ -1874,7 +1869,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;
 	}
@@ -1896,7 +1891,7 @@ make_server(struct Client *client_p)
 
 	if(!serv)
 	{
-		serv = (server_t *) MyMalloc(sizeof(server_t));
+		serv = (server_t *) rb_malloc(sizeof(server_t));
 		client_p->serv = serv;
 	}
 	return client_p->serv;
@@ -1914,10 +1909,12 @@ 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)
-			MyFree((char *) user->away);
+			rb_free((char *) user->away);
 		/*
 		 * sanity check
 		 */
@@ -1940,7 +1937,24 @@ 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;
 	}
 }
 
@@ -2017,7 +2031,7 @@ close_connection(struct Client *client_p)
 		ServerStats->is_sbr += client_p->localClient->receiveB;
 		ServerStats->is_sks += client_p->localClient->sendK;
 		ServerStats->is_skr += client_p->localClient->receiveK;
-		ServerStats->is_sti += CurrentTime - client_p->localClient->firsttime;
+		ServerStats->is_sti += rb_current_time() - client_p->localClient->firsttime;
 		if(ServerStats->is_sbs > 2047)
 		{
 			ServerStats->is_sks += (ServerStats->is_sbs >> 10);
@@ -2055,7 +2069,7 @@ close_connection(struct Client *client_p)
 		ServerStats->is_cbr += client_p->localClient->receiveB;
 		ServerStats->is_cks += client_p->localClient->sendK;
 		ServerStats->is_ckr += client_p->localClient->receiveK;
-		ServerStats->is_cti += CurrentTime - client_p->localClient->firsttime;
+		ServerStats->is_cti += rb_current_time() - client_p->localClient->firsttime;
 		if(ServerStats->is_cbs > 2047)
 		{
 			ServerStats->is_cks += (ServerStats->is_cbs >> 10);
@@ -2074,20 +2088,14 @@ close_connection(struct Client *client_p)
 	{
 		/* attempt to flush any pending dbufs. Evil, but .. -- adrian */
 		if(!IsIOError(client_p))
-			send_queued_write(client_p->localClient->F->fd, client_p);
+			send_queued(client_p);
 
-		rb_close(client_p->localClient->F->fd);
+		rb_close(client_p->localClient->F);
 		client_p->localClient->F = NULL;
 	}
 
-	if(-1 < client_p->localClient->ctrlfd)
-	{
-		rb_close(client_p->localClient->ctrlfd);
-		client_p->localClient->ctrlfd = -1;
-	}
-
-	linebuf_donebuf(&client_p->localClient->buf_sendq);
-	linebuf_donebuf(&client_p->localClient->buf_recvq);
+	rb_linebuf_donebuf(&client_p->localClient->buf_sendq);
+	rb_linebuf_donebuf(&client_p->localClient->buf_recvq);
 	detach_conf(client_p);
 
 	/* XXX shouldnt really be done here. */
@@ -2113,7 +2121,7 @@ error_exit_client(struct Client *client_p, int error)
 	 * for reading even though it ends up being an EOF. -avalon
 	 */
 	char errmsg[255];
-	int current_error = rb_get_sockerr(client_p->localClient->F->fd);
+	int current_error = rb_get_sockerr(client_p->localClient->F);
 
 	SetIOError(client_p);