X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/788813d6f3e942cc1d411d9dc366650b65ee7e1f..13ae2f4b6904ebf7b8160902f9ffeb80f7585ed2:/src/client.c

diff --git a/src/client.c b/src/client.c
index a359069..0d4f5a1 100644
--- a/src/client.c
+++ b/src/client.c
@@ -31,16 +31,14 @@
 #include "class.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
-#include "s_gline.h"
 #include "numeric.h"
 #include "packet.h"
 #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"
@@ -56,6 +54,7 @@
 #include "reject.h"
 #include "scache.h"
 #include "irc_dictionary.h"
+#include "sslproc.h"
 
 #define DEBUG_EXITED_CLIENTS
 
@@ -85,8 +84,7 @@ struct Dictionary *nd_dict = NULL;
 enum
 {
 	D_LINED,
-	K_LINED,
-	G_LINED
+	K_LINED
 };
 
 rb_dlink_list dead_list;
@@ -118,7 +116,7 @@ init_client(void)
 	 * start off the check ping event ..  -- adrian
 	 * Every 30 seconds is plenty -- db
 	 */
-	client_heap = rb_bh_create(sizeof(struct Client), CLIENT_HEAP_SIZE, "client_heap");
+	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");
@@ -126,6 +124,7 @@ init_client(void)
 	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);
 }
@@ -160,7 +159,6 @@ make_client(struct Client *from)
 		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 *) rb_bh_alloc(pclient_heap);
 
@@ -219,8 +217,11 @@ free_local_client(struct Client *client_p)
 		client_p->localClient->listener = 0;
 	}
 
-	if(client_p->localClient->F)
+	if(client_p->localClient->F != NULL)
+	{
+		del_from_cli_fd_hash(client_p);
 		rb_close(client_p->localClient->F);
+	}
 
 	if(client_p->localClient->passwd)
 	{
@@ -234,6 +235,8 @@ free_local_client(struct Client *client_p)
 	rb_free(client_p->localClient->opername);
 	rb_free(client_p->localClient->mangledhost);
 
+	ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+
 	rb_bh_free(lclient_heap, client_p->localClient);
 	client_p->localClient = NULL;
 }
@@ -398,7 +401,6 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
 	static const char conn_closed[] = "Connection closed";
 	static const char d_lined[] = "D-lined";
 	static const char k_lined[] = "K-lined";
-	static const char g_lined[] = "G-lined";
 	const char *reason = NULL;
 	const char *exit_reason = conn_closed;
 
@@ -414,9 +416,6 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
 		case D_LINED:
 			reason = d_lined;
 			break;
-		case G_LINED:
-			reason = g_lined;
-			break;
 		default:
 			reason = k_lined;
 			break;
@@ -438,7 +437,7 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
  * check_banned_lines
  * inputs	- NONE
  * output	- NONE
- * side effects - Check all connections for a pending k/d/gline against the
+ * side effects - Check all connections for a pending k/dline against the
  * 		  client, exit the client if found.
  */
 void
@@ -456,7 +455,7 @@ check_banned_lines(void)
 			continue;
 
 		/* if there is a returned struct ConfItem then kill it */
-		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip)))
+		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip, client_p->localClient->ip.ss_family)))
 		{
 			if(aconf->status & CONF_EXEMPTDLINE)
 				continue;
@@ -489,33 +488,6 @@ check_banned_lines(void)
 			notify_banned_client(client_p, aconf, K_LINED);
 			continue;
 		}
-		else if((aconf = find_gline(client_p)) != NULL)
-		{
-			if(IsExemptKline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						"GLINE over-ruled for %s, client is kline_exempt [%s@%s]",
-						get_client_name(client_p, HIDE_IP),
-						aconf->user, aconf->host);
-				continue;
-			}
-
-			if(IsExemptGline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						"GLINE over-ruled for %s, client is gline_exempt [%s@%s]",
-						get_client_name(client_p, HIDE_IP),
-						aconf->user, aconf->host);
-				continue;
-			}
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					"GLINE active for %s",
-					get_client_name(client_p, HIDE_IP));
-
-			notify_banned_client(client_p, aconf, G_LINED);
-			continue;
-		}
 		else if((aconf = find_xline(client_p->info, 1)) != NULL)
 		{
 			if(IsExemptKline(client_p))
@@ -540,7 +512,7 @@ check_banned_lines(void)
 	{
 		client_p = ptr->data;
 
-		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip)))
+		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip,client_p->localClient->ip.ss_family)))
 		{
 			if(aconf->status & CONF_EXEMPTDLINE)
 				continue;
@@ -605,55 +577,6 @@ check_klines(void)
 	}
 }
 
-/* check_glines()
- *
- * inputs       -
- * outputs      -
- * side effects - all clients will be checked for glines
- */
-void
-check_glines(void)
-{
-	struct Client *client_p;
-	struct ConfItem *aconf;
-	rb_dlink_node *ptr;
-	rb_dlink_node *next_ptr;
-
-	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
-	{
-		client_p = ptr->data;
-
-		if(IsMe(client_p) || !IsPerson(client_p))
-			continue;
-
-		if((aconf = find_gline(client_p)) != NULL)
-		{
-			if(IsExemptKline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						     "GLINE over-ruled for %s, client is kline_exempt",
-						     get_client_name(client_p, HIDE_IP));
-				continue;
-			}
-
-			if(IsExemptGline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						     "GLINE over-ruled for %s, client is gline_exempt",
-						     get_client_name(client_p, HIDE_IP));
-				continue;
-			}
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					     "GLINE active for %s",
-					     get_client_name(client_p, HIDE_IP));
-
-			notify_banned_client(client_p, aconf, K_LINED);
-			continue;
-		}
-	}
-}
-
 /* check_dlines()
  *
  * inputs       -
@@ -675,7 +598,7 @@ check_dlines(void)
 		if(IsMe(client_p))
 			continue;
 
-		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip) != NULL)
+		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip,client_p->localClient->ip.ss_family)) != NULL)
 		{
 			if(aconf->status & CONF_EXEMPTDLINE)
 				continue;
@@ -694,7 +617,7 @@ check_dlines(void)
 	{
 		client_p = ptr->data;
 
-		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip)) != NULL)
+		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip,client_p->localClient->ip.ss_family)) != NULL)
 		{
 			if(aconf->status & CONF_EXEMPTDLINE)
 				continue;
@@ -1307,7 +1230,7 @@ dead_link(struct Client *client_p)
 	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));
+		rb_strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
 	else
 		rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
 
@@ -1401,6 +1324,12 @@ 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);
 
 	if(!IsIOError(source_p))
@@ -1582,6 +1511,7 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien
 		  const char *comment)
 {
 	unsigned long on_for;
+	char tbuf[26];
 
 	exit_generic_client(client_p, source_p, from, comment);
 	clear_monitor(source_p);
@@ -1608,7 +1538,7 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien
 	on_for = rb_current_time() - source_p->localClient->firsttime;
 
 	ilog(L_USER, "%s (%3lu:%02lu:%02lu): %s!%s@%s %d/%d",
-		myctime(rb_current_time()), on_for / 3600,
+		rb_ctime(rb_current_time(), tbuf, sizeof(tbuf)), 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);
@@ -1710,8 +1640,8 @@ exit_client(struct Client *client_p,	/* The local client originating the
 void
 count_local_client_memory(size_t * count, size_t * local_client_memory_used)
 {
-	size_t lusage;
-	rb_bh_usage(lclient_heap, count, NULL, &lusage, NULL);
+	size_t lusage;
+	rb_bh_usage(lclient_heap, count, NULL, &lusage, NULL);
 	*local_client_memory_used = lusage + (*count * (sizeof(void *) + sizeof(struct Client)));
 }
 
@@ -1721,10 +1651,10 @@ count_local_client_memory(size_t * count, size_t * local_client_memory_used)
 void
 count_remote_client_memory(size_t * count, size_t * remote_client_memory_used)
 {
-	size_t lcount, rcount;
-	rb_bh_usage(lclient_heap, &lcount, NULL, NULL, NULL);
-	rb_bh_usage(client_heap, &rcount, NULL, NULL, NULL);
-	*count = rcount - lcount;
+	size_t lcount, rcount;
+	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(void *) + sizeof(struct Client));
 }
 
@@ -1951,7 +1881,7 @@ allocate_away(struct Client *client_p)
 void
 free_away(struct Client *client_p)
 {
-	if(client_p->user->away != NULL) {
+	if(client_p->user != NULL && client_p->user->away != NULL) {
 		rb_bh_free(away_heap, client_p->user->away);
 		client_p->user->away = NULL;
 	}
@@ -2028,19 +1958,7 @@ close_connection(struct Client *client_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_sks += (ServerStats.is_sbs >> 10);
-			ServerStats.is_sbs &= 0x3ff;
-		}
-		if(ServerStats.is_sbr > 2047)
-		{
-			ServerStats.is_skr += (ServerStats.is_sbr >> 10);
-			ServerStats.is_sbr &= 0x3ff;
-		}
 
 		/*
 		 * If the connection has been up for a long amount of time, schedule
@@ -2066,32 +1984,20 @@ close_connection(struct Client *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_cks += (ServerStats.is_cbs >> 10);
-			ServerStats.is_cbs &= 0x3ff;
-		}
-		if(ServerStats.is_cbr > 2047)
-		{
-			ServerStats.is_ckr += (ServerStats.is_cbr >> 10);
-			ServerStats.is_cbr &= 0x3ff;
-		}
 	}
 	else
 		ServerStats.is_ni++;
 
-	/* XXX ctrlFd was here!!! */
-	if(client_p->localClient->F != NULL)
-	{
-		/* attempt to flush any pending linebufs. Evil, but .. -- adrian */
-		if(!IsIOError(client_p))
-			send_pop_queue(client_p);
-		del_from_cli_fd_hash(client_p);			
-		rb_close(client_p->localClient->F);
-		client_p->localClient->F = NULL;
+	if(client_p->localClient->F != NULL)
+	{
+		/* attempt to flush any pending dbufs. Evil, but .. -- adrian */
+		if(!IsIOError(client_p))
+			send_queued(client_p);
+
+		del_from_cli_fd_hash(client_p);
+		rb_close(client_p->localClient->F);
+		client_p->localClient->F = NULL;
 	}
 
 	rb_linebuf_donebuf(&client_p->localClient->buf_sendq);
@@ -2147,7 +2053,7 @@ error_exit_client(struct Client *client_p, int error)
 	}
 
 	if(error == 0)
-		strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
+		rb_strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
 	else
 		rb_snprintf(errmsg, sizeof(errmsg), "Read error: %s", strerror(current_error));