X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/43de0f45a19c2aa98e9159a0531231e88bde88a4..8e69bb4e903f428b14e2950cce9be39dc8ddd12c:/src/client.c

diff --git a/src/client.c b/src/client.c
index ab8349e..3c36b8f 100644
--- a/src/client.c
+++ b/src/client.c
@@ -65,8 +65,8 @@
 
 #define DEBUG_EXITED_CLIENTS
 
-static void check_pings_list(dlink_list * list);
-static void check_unknowns_list(dlink_list * list);
+static void check_pings_list(rb_dlink_list * list);
+static void check_unknowns_list(rb_dlink_list * list);
 static void free_exited_clients(void *unused);
 static void exit_aborted_clients(void *unused);
 
@@ -94,19 +94,19 @@ enum
 	G_LINED
 };
 
-dlink_list dead_list;
+rb_dlink_list dead_list;
 #ifdef DEBUG_EXITED_CLIENTS
-static dlink_list dead_remote_list;
+static rb_dlink_list dead_remote_list;
 #endif
 
 struct abort_client
 {
- 	dlink_node node;
+ 	rb_dlink_node node;
   	struct Client *client;
   	char notice[REASONLEN];
 };
 
-static dlink_list abort_list;
+static rb_dlink_list abort_list;
 
 
 /*
@@ -162,13 +162,13 @@ make_client(struct Client *from)
 
 		client_p->localClient->lasttime = client_p->localClient->firsttime = CurrentTime;
 
-		client_p->localClient->fd = -1;
+		client_p->localClient->F = NULL;
 		client_p->localClient->ctrlfd = -1;
 
 		client_p->preClient = (struct PreClient *) BlockHeapAlloc(pclient_heap);
 
 		/* as good a place as any... */
-		dlinkAdd(client_p, &client_p->localClient->tnode, &unknown_list);
+		rb_dlinkAdd(client_p, &client_p->localClient->tnode, &unknown_list);
 	}
 	else
 	{			/* from is not NULL */
@@ -222,8 +222,8 @@ free_local_client(struct Client *client_p)
 		client_p->localClient->listener = 0;
 	}
 
-	if(client_p->localClient->fd >= 0)
-		comm_close(client_p->localClient->fd);
+	if(client_p->localClient->F)
+		rb_close(client_p->localClient->F->fd);
 
 	if(client_p->localClient->passwd)
 	{
@@ -293,56 +293,21 @@ check_pings(void *notused)
  * side effects	- 
  */
 static void
-check_pings_list(dlink_list * list)
+check_pings_list(rb_dlink_list * list)
 {
 	char scratch[32];	/* way too generous but... */
 	struct Client *client_p;	/* current local client_p being examined */
 	int ping = 0;		/* ping time value from client */
-	dlink_node *ptr, *next_ptr;
+	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;
 
-		/*
-		 ** Note: No need to notify opers here. It's
-		 ** already done when "FLAGS_DEADSOCKET" is set.
-		 */
 		if(!MyConnect(client_p) || IsDead(client_p))
 			continue;
 
-		if(IsPerson(client_p))
-		{
-			if(!IsExemptKline(client_p) &&
-			   GlobalSetOptions.idletime &&
-			   !IsOper(client_p) &&
-			   !IsIdlelined(client_p) &&
-			   ((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime))
-			{
-				struct ConfItem *aconf;
-
-				aconf = make_conf();
-				aconf->status = CONF_KILL;
-
-				DupString(aconf->host, client_p->host);
-				DupString(aconf->passwd, "idle exceeder");
-				DupString(aconf->user, client_p->username);
-				aconf->port = 0;
-				aconf->hold = CurrentTime + 60;
-				add_temp_kline(aconf);
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						     "Idle time limit exceeded for %s - temp k-lining",
-						     get_client_name(client_p, HIDE_IP));
-
-				exit_client(client_p, client_p, &me, aconf->passwd);
-				continue;
-			}
-		}
-
-		if(!IsRegistered(client_p))
-			ping = ConfigFileEntry.connect_timeout;
-		else
-			ping = get_client_ping(client_p);
+		ping = get_client_ping(client_p);
 
 		if(ping < (CurrentTime - client_p->localClient->lasttime))
 		{
@@ -353,16 +318,16 @@ check_pings_list(dlink_list * list)
 			if(((CurrentTime - client_p->localClient->lasttime) >= (2 * ping)
 			    && (client_p->flags & FLAGS_PINGSENT)))
 			{
-				if(IsAnyServer(client_p))
+				if(IsServer(client_p))
 				{
-					sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL,
+					sendto_realops_snomask(SNO_GENERAL, L_ALL,
 							     "No response from %s, closing link",
 							     get_server_name(client_p, HIDE_IP));
 					ilog(L_SERVER,
 					     "No response from %s, closing link",
 					     log_client_name(client_p, HIDE_IP));
 				}
-				(void) ircsnprintf(scratch, sizeof(scratch),
+				(void) rb_snprintf(scratch, sizeof(scratch),
 						  "Ping timeout: %d seconds",
 						  (int) (CurrentTime - client_p->localClient->lasttime));
 
@@ -395,12 +360,13 @@ check_pings_list(dlink_list * list)
  * side effects	- unknown clients get marked for termination after n seconds
  */
 static void
-check_unknowns_list(dlink_list * list)
+check_unknowns_list(rb_dlink_list * list)
 {
-	dlink_node *ptr, *next_ptr;
+	rb_dlink_node *ptr, *next_ptr;
 	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;
 
@@ -412,8 +378,20 @@ check_unknowns_list(dlink_list * list)
 		 * for > 30s, close them.
 		 */
 
-		if((CurrentTime - client_p->localClient->firsttime) > 30)
+		timeout = IsAnyServer(client_p) ? ConfigFileEntry.connect_timeout : 30;
+		if((CurrentTime - client_p->localClient->firsttime) > timeout)
+		{
+			if(IsAnyServer(client_p))
+			{
+				sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+						     "No response from %s, closing link",
+						     get_server_name(client_p, HIDE_IP));
+				ilog(L_SERVER,
+				     "No response from %s, closing link",
+				     log_client_name(client_p, HIDE_IP));
+			}
 			exit_client(client_p, client_p, &me, "Connection timed out");
+		}
 	}
 }
 
@@ -471,9 +449,9 @@ check_banned_lines(void)
 {
 	struct Client *client_p;	/* current local client_p being examined */
 	struct ConfItem *aconf = NULL;
-	dlink_node *ptr, *next_ptr;
+	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;
 
@@ -561,7 +539,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;
 
@@ -600,10 +578,10 @@ check_klines(void)
 {
 	struct Client *client_p;
 	struct ConfItem *aconf;
-	dlink_node *ptr;
-	dlink_node *next_ptr;
+	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;
 
@@ -641,10 +619,10 @@ check_glines(void)
 {
 	struct Client *client_p;
 	struct ConfItem *aconf;
-	dlink_node *ptr;
-	dlink_node *next_ptr;
+	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;
 
@@ -690,10 +668,10 @@ check_dlines(void)
 {
 	struct Client *client_p;
 	struct ConfItem *aconf;
-	dlink_node *ptr;
-	dlink_node *next_ptr;
+	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;
 
@@ -715,7 +693,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;
 
@@ -740,10 +718,10 @@ check_xlines(void)
 {
 	struct Client *client_p;
 	struct ConfItem *aconf;
-	dlink_node *ptr;
-	dlink_node *next_ptr;
+	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;
 
@@ -848,7 +826,7 @@ remove_client_from_list(struct Client *client_p)
 	if(client_p->node.prev == NULL && client_p->node.next == NULL)
 		return;
 
-	dlinkDelete(&client_p->node, &global_client_list);
+	rb_dlinkDelete(&client_p->node, &global_client_list);
 
 	update_client_exit_stats(client_p);
 }
@@ -963,16 +941,16 @@ get_client_name(struct Client *client, int showip)
 		switch (showip)
 		{
 		case SHOW_IP:
-			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", 
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", 
 				   client->name, client->username, 
 				   client->sockhost);
 			break;
 		case MASK_IP:
-			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
 				   client->name, client->username);
 			break;
 		default:
-			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
 				   client->name, client->username, client->host);
 		}
 		return nbuf;
@@ -998,7 +976,7 @@ get_server_name(struct Client *target_p, int showip)
 #ifdef HIDE_SERVERS_IPS
 	if(EmptyString(target_p->name))
 	{
-		ircsnprintf(nbuf, sizeof(nbuf), "[%s@255.255.255.255]",
+		rb_snprintf(nbuf, sizeof(nbuf), "[%s@255.255.255.255]",
 				target_p->username);
 		return nbuf;
 	}
@@ -1009,17 +987,17 @@ get_server_name(struct Client *target_p, int showip)
 	switch (showip)
 	{
 		case SHOW_IP:
-			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
 				target_p->name, target_p->username, 
 				target_p->sockhost);
 			break;
 
 		case MASK_IP:
-			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
 				target_p->name, target_p->username);
 
 		default:
-			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
 				target_p->name, target_p->username,
 				target_p->host);
 	}
@@ -1048,16 +1026,16 @@ log_client_name(struct Client *target_p, int showip)
 		switch (showip)
 		{
 		case SHOW_IP:
-			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
 				   target_p->username, target_p->sockhost);
 			break;
 
 		case MASK_IP:
-			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
 				   target_p->name, target_p->username);
 
 		default:
-			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
 				   target_p->username, target_p->host);
 		}
 
@@ -1083,20 +1061,20 @@ is_remote_connect(struct Client *client_p)
 static void
 free_exited_clients(void *unused)
 {
-	dlink_node *ptr, *next;
+	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;
 
 #ifdef DEBUG_EXITED_CLIENTS
 		{
 			struct abort_client *abt;
-			dlink_node *aptr;
+			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)
@@ -1114,7 +1092,7 @@ free_exited_clients(void *unused)
 
 			if(found)
 			{
-				dlinkDestroy(ptr, &dead_list);
+				rb_dlinkDestroy(ptr, &dead_list);
 				continue;
 			}
 		}
@@ -1124,16 +1102,16 @@ free_exited_clients(void *unused)
 		{
 			sendto_realops_snomask(SNO_GENERAL, L_ALL,
 					     "Warning: null client on dead_list!");
-			dlinkDestroy(ptr, &dead_list);
+			rb_dlinkDestroy(ptr, &dead_list);
 			continue;
 		}
 		release_client_state(target_p);
 		free_client(target_p);
-		dlinkDestroy(ptr, &dead_list);
+		rb_dlinkDestroy(ptr, &dead_list);
 	}
 
 #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;
 
@@ -1141,12 +1119,12 @@ free_exited_clients(void *unused)
 		{
 			sendto_realops_snomask(SNO_GENERAL, L_ALL,
 					     "Warning: null client on dead_list!");
-			dlinkDestroy(ptr, &dead_list);
+			rb_dlinkDestroy(ptr, &dead_list);
 			continue;
 		}
 		release_client_state(target_p);
 		free_client(target_p);
-		dlinkDestroy(ptr, &dead_remote_list);
+		rb_dlinkDestroy(ptr, &dead_remote_list);
 	}
 #endif
 	
@@ -1166,7 +1144,7 @@ recurse_send_quits(struct Client *client_p, struct Client *source_p,
 		   const char *comment)
 {
 	struct Client *target_p;
-	dlink_node *ptr, *ptr_next;
+	rb_dlink_node *ptr, *ptr_next;
 	/* If this server can handle quit storm (QS) removal
 	 * of dependents, just send the SQUIT
 	 */
@@ -1178,12 +1156,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);
@@ -1205,7 +1183,7 @@ static void
 recurse_remove_clients(struct Client *source_p, const char *comment)
 {
 	struct Client *target_p;
-	dlink_node *ptr, *ptr_next;
+	rb_dlink_node *ptr, *ptr_next;
 
 	if(IsMe(source_p))
 		return;
@@ -1216,7 +1194,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;
@@ -1228,7 +1206,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;
@@ -1238,7 +1216,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);
@@ -1257,9 +1235,9 @@ remove_dependents(struct Client *client_p,
 		  struct Client *from, const char *comment, const char *comment1)
 {
 	struct Client *to;
-	dlink_node *ptr, *next;
+	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;
 
@@ -1277,14 +1255,14 @@ void
 exit_aborted_clients(void *unused)
 {
 	struct abort_client *abt;
- 	dlink_node *ptr, *next;
- 	DLINK_FOREACH_SAFE(ptr, next, abort_list.head)
+ 	rb_dlink_node *ptr, *next;
+ 	RB_DLINK_FOREACH_SAFE(ptr, next, abort_list.head)
  	{
  	 	abt = ptr->data;
 
 #ifdef DEBUG_EXITED_CLIENTS
 		{
-			if(dlinkFind(abt->client, &dead_list))
+			if(rb_dlinkFind(abt->client, &dead_list))
 			{
 				s_assert(0);
 				sendto_realops_snomask(SNO_GENERAL, L_ALL, 
@@ -1299,7 +1277,7 @@ exit_aborted_clients(void *unused)
 #endif
 
  		s_assert(*((unsigned long*)abt->client) != 0xdeadbeef); /* This is lame but its a debug thing */
- 	 	dlinkDelete(ptr, &abort_list);
+ 	 	rb_dlinkDelete(ptr, &abort_list);
 
  	 	if(IsAnyServer(abt->client))
  	 	 	sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -1334,13 +1312,13 @@ dead_link(struct Client *client_p)
 	if(client_p->flags & FLAGS_SENDQEX)
 		strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
 	else
-		ircsnprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
+		rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
 
     	abt->client = client_p;
 	SetIOError(client_p);
 	SetDead(client_p);
 	SetClosing(client_p);
-	dlinkAdd(abt, &abt->node, &abort_list);
+	rb_dlinkAdd(abt, &abt->node, &abort_list);
 }
 
 
@@ -1349,10 +1327,10 @@ static inline void
 exit_generic_client(struct Client *client_p, struct Client *source_p, struct Client *from,
 		   const char *comment)
 {
-	dlink_node *ptr, *next_ptr;
+	rb_dlink_node *ptr, *next_ptr;
 
 	if(IsOper(source_p))
-		dlinkFindDestroy(source_p, &oper_list);
+		rb_dlinkFindDestroy(source_p, &oper_list);
 
 	sendto_common_channels_local(source_p, ":%s!%s@%s QUIT :%s",
 				     source_p->name,
@@ -1364,7 +1342,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);
 	}
@@ -1397,7 +1375,7 @@ exit_remote_client(struct Client *client_p, struct Client *source_p, struct Clie
 	
 	if(source_p->servptr && source_p->servptr->serv)
 	{
-		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
+		rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
 	}
 
 	if((source_p->flags & FLAGS_KILLED) == 0)
@@ -1410,9 +1388,9 @@ exit_remote_client(struct Client *client_p, struct Client *source_p, struct Clie
 
 	SetDead(source_p);
 #ifdef DEBUG_EXITED_CLIENTS
-	dlinkAddAlloc(source_p, &dead_remote_list);
+	rb_dlinkAddAlloc(source_p, &dead_remote_list);
 #else
-	dlinkAddAlloc(source_p, &dead_list);
+	rb_dlinkAddAlloc(source_p, &dead_list);
 #endif
 	return(CLIENT_EXITED);
 }
@@ -1428,7 +1406,7 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
 	delete_auth_queries(source_p);
 	client_flush_input(source_p);
 	del_unknown_ip(source_p);
-	dlinkDelete(&source_p->localClient->tnode, &unknown_list);
+	rb_dlinkDelete(&source_p->localClient->tnode, &unknown_list);
 
 	if(!IsIOError(source_p))
 		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
@@ -1444,7 +1422,7 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
 	del_from_client_hash(source_p->name, source_p);
 	remove_client_from_list(source_p);
 	SetDead(source_p);
-	dlinkAddAlloc(source_p, &dead_list);
+	rb_dlinkAddAlloc(source_p, &dead_list);
 
 	/* Note that we don't need to add unknowns to the dead_list */
 	return(CLIENT_EXITED);
@@ -1467,18 +1445,18 @@ exit_remote_server(struct Client *client_p, struct Client *source_p, struct Clie
 		strcat(comment1, source_p->name);
 	}
 	if (IsPerson(from))
-		ircsnprintf(newcomment, sizeof(newcomment), "by %s: %s",
+		rb_snprintf(newcomment, sizeof(newcomment), "by %s: %s",
 				from->name, comment);
 
 	if(source_p->serv != NULL)
 		remove_dependents(client_p, source_p, from, IsPerson(from) ? newcomment : comment, comment1);
 
 	if(source_p->servptr && source_p->servptr->serv)
-		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
+		rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
 	else
 		s_assert(0);
 
-	dlinkFindDestroy(source_p, &global_serv_list);
+	rb_dlinkFindDestroy(source_p, &global_serv_list);
 	target_p = source_p->from;
 	
 	if(target_p != NULL && IsServer(target_p) && target_p != client_p &&
@@ -1498,9 +1476,9 @@ exit_remote_server(struct Client *client_p, struct Client *source_p, struct Clie
 	
 	SetDead(source_p);
 #ifdef DEBUG_EXITED_CLIENTS
-	dlinkAddAlloc(source_p, &dead_remote_list);
+	rb_dlinkAddAlloc(source_p, &dead_remote_list);
 #else
-	dlinkAddAlloc(source_p, &dead_list);
+	rb_dlinkAddAlloc(source_p, &dead_list);
 #endif
 	return 0;
 }
@@ -1512,11 +1490,11 @@ qs_server(struct Client *client_p, struct Client *source_p, struct Client *from,
 	struct Client *target_p;
 
 	if(source_p->servptr && source_p->servptr->serv)
-		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
+		rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
 	else
 		s_assert(0);
 
-	dlinkFindDestroy(source_p, &global_serv_list);
+	rb_dlinkFindDestroy(source_p, &global_serv_list);
 	target_p = source_p->from;
 	
 	if(has_id(source_p))
@@ -1524,9 +1502,10 @@ qs_server(struct Client *client_p, struct Client *source_p, struct Client *from,
 
 	del_from_client_hash(source_p->name, source_p);
 	remove_client_from_list(source_p);  
+	scache_split(source_p->serv->nameinfo);
 	
 	SetDead(source_p);
-	dlinkAddAlloc(source_p, &dead_list);	
+	rb_dlinkAddAlloc(source_p, &dead_list);	
 	return 0;
 }
 
@@ -1538,8 +1517,8 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 	static char newcomment[BUFSIZE];
 	unsigned int sendk, recvk;
 	
-	dlinkDelete(&source_p->localClient->tnode, &serv_list);
-	dlinkFindDestroy(source_p, &global_serv_list);
+	rb_dlinkDelete(&source_p->localClient->tnode, &serv_list);
+	rb_dlinkFindDestroy(source_p, &global_serv_list);
 	
 	unset_chcap_usage_counts(source_p);
 	sendk = source_p->localClient->sendK;
@@ -1548,7 +1527,7 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 	/* Always show source here, so the server notices show
 	 * which side initiated the split -- jilles
 	 */
-	ircsnprintf(newcomment, sizeof(newcomment), "by %s: %s",
+	rb_snprintf(newcomment, sizeof(newcomment), "by %s: %s",
 			from == source_p ? me.name : from->name, comment);
 	if (!IsIOError(source_p))
 		sendto_one(source_p, "SQUIT %s :%s", use_id(source_p),
@@ -1560,7 +1539,7 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 	}
 	
 	if(source_p->servptr && source_p->servptr->serv)
-		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
+		rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
 	else
 		s_assert(0);
 
@@ -1594,7 +1573,7 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 	scache_split(source_p->serv->nameinfo);
 	
 	SetDead(source_p);
-	dlinkAddAlloc(source_p, &dead_list);
+	rb_dlinkAddAlloc(source_p, &dead_list);
 	return 0;
 }
 
@@ -1614,11 +1593,11 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien
 
 	s_assert(IsPerson(source_p));
 	client_flush_input(source_p);
-	dlinkDelete(&source_p->localClient->tnode, &lclient_list);
-	dlinkDelete(&source_p->lnode, &me.serv->users);
+	rb_dlinkDelete(&source_p->localClient->tnode, &lclient_list);
+	rb_dlinkDelete(&source_p->lnode, &me.serv->users);
 
 	if(IsOper(source_p))
-		dlinkFindDestroy(source_p, &local_oper_list);
+		rb_dlinkFindDestroy(source_p, &local_oper_list);
 
 	sendto_realops_snomask(SNO_CCONN, L_ALL,
 			     "Client exiting: %s (%s@%s) [%s] [%s]",
@@ -1652,7 +1631,7 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien
 	}
 
 	SetDead(source_p);
-	dlinkAddAlloc(source_p, &dead_list);
+	rb_dlinkAddAlloc(source_p, &dead_list);
 	return(CLIENT_EXITED);
 }
 
@@ -1784,8 +1763,8 @@ count_remote_client_memory(size_t * count, size_t * remote_client_memory_used)
 void
 del_all_accepts(struct Client *client_p)
 {
-	dlink_node *ptr;
-	dlink_node *next_ptr;
+	rb_dlink_node *ptr;
+	rb_dlink_node *next_ptr;
 	struct Client *target_p;
 
 	if(MyClient(client_p) && client_p->localClient->allow_list.head)
@@ -1793,20 +1772,20 @@ 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;
-			dlinkFindDestroy(client_p, &target_p->on_allow_list);
-			dlinkDestroy(ptr, &client_p->localClient->allow_list);
+			rb_dlinkFindDestroy(client_p, &target_p->on_allow_list);
+			rb_dlinkDestroy(ptr, &client_p->localClient->allow_list);
 		}
 	}
 
 	/* 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;
-		dlinkFindDestroy(client_p, &target_p->localClient->allow_list);
-		dlinkDestroy(ptr, &client_p->on_allow_list);
+		rb_dlinkFindDestroy(client_p, &target_p->localClient->allow_list);
+		rb_dlinkDestroy(ptr, &client_p->on_allow_list);
 	}
 }
 
@@ -1954,7 +1933,7 @@ free_user(struct User *user, struct Client *client_p)
 					     (unsigned long) user,
 					     (unsigned long) user->invited.head,
 					     (unsigned long) user->channel.head, 
-					     dlink_list_length(&user->channel),
+					     rb_dlink_list_length(&user->channel),
 					     user->refcnt);
 			s_assert(!user->refcnt);
 			s_assert(!user->invited.head);
@@ -2091,19 +2070,19 @@ close_connection(struct Client *client_p)
 	else
 		ServerStats->is_ni++;
 
-	if(-1 < client_p->localClient->fd)
+	if(client_p->localClient->F)
 	{
 		/* attempt to flush any pending dbufs. Evil, but .. -- adrian */
 		if(!IsIOError(client_p))
-			send_queued_write(client_p->localClient->fd, client_p);
+			send_queued_write(client_p->localClient->F->fd, client_p);
 
-		comm_close(client_p->localClient->fd);
-		client_p->localClient->fd = -1;
+		rb_close(client_p->localClient->F->fd);
+		client_p->localClient->F = NULL;
 	}
 
 	if(-1 < client_p->localClient->ctrlfd)
 	{
-		comm_close(client_p->localClient->ctrlfd);
+		rb_close(client_p->localClient->ctrlfd);
 		client_p->localClient->ctrlfd = -1;
 	}
 
@@ -2134,14 +2113,12 @@ 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 = comm_get_sockerr(client_p->localClient->fd);
+	int current_error = rb_get_sockerr(client_p->localClient->F->fd);
 
 	SetIOError(client_p);
 
 	if(IsServer(client_p) || IsHandshake(client_p))
 	{
-		int connected = CurrentTime - client_p->localClient->firsttime;
-
 		if(error == 0)
 		{
 			sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL,
@@ -2159,19 +2136,12 @@ error_exit_client(struct Client *client_p, int error)
 			ilog(L_SERVER, "Lost connection to %s: %s",
 				log_client_name(client_p, SHOW_IP), strerror(current_error));
 		}
-
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
-				     "%s had been connected for %d day%s, %2d:%02d:%02d",
-				     client_p->name, connected / 86400,
-				     (connected / 86400 == 1) ? "" : "s",
-				     (connected % 86400) / 3600,
-				     (connected % 3600) / 60, connected % 60);
 	}
 
 	if(error == 0)
 		strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
 	else
-		ircsnprintf(errmsg, sizeof(errmsg), "Read error: %s", strerror(current_error));
+		rb_snprintf(errmsg, sizeof(errmsg), "Read error: %s", strerror(current_error));
 
 	exit_client(client_p, client_p, &me, errmsg);
 }