X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/16d59a0d4a10f4e2b51fee199826a6089d3030c1..4d23dfbcb5731bf38ff062b2c73219f001d7c291:/src/client.c

diff --git a/src/client.c b/src/client.c
index 81be16f..012076b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -162,7 +162,7 @@ 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);
@@ -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->fd >= 0)
+		comm_close(client_p->localClient->F->fd);
 
 	if(client_p->localClient->passwd)
 	{
@@ -304,10 +304,6 @@ check_pings_list(dlink_list * list)
 	{
 		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;
 
@@ -2101,14 +2097,14 @@ 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;
+		comm_close(client_p->localClient->F->fd);
+		client_p->localClient->F = NULL;
 	}
 
 	if(-1 < client_p->localClient->ctrlfd)
@@ -2144,7 +2140,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 = comm_get_sockerr(client_p->localClient->fd);
+	int current_error = comm_get_sockerr(client_p->localClient->F->fd);
 
 	SetIOError(client_p);