X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8e69bb4e903f428b14e2950cce9be39dc8ddd12c..75818939ab299b595e847692904a41055178f69f:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 8c7a920..63d88dc 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -25,30 +25,26 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "s_user.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "listener.h"
 #include "msg.h"
 #include "numeric.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 "scache.h"
 #include "send.h"
 #include "supported.h"
 #include "whowas.h"
-#include "memory.h"
 #include "packet.h"
 #include "reject.h"
 #include "cache.h"
@@ -97,7 +93,7 @@ int user_modes[256] = {
 	0,			/* W */
 	0,			/* X */
 	0,			/* Y */
-	0,			/* Z */
+	UMODE_SSLCLIENT,	/* Z */
 	/* 0x5B */ 0, 0, 0, 0, 0, 0, /* 0x60 */
 	UMODE_ADMIN,		/* a */
 	0,			/* b */
@@ -264,7 +260,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	if(rb_dlink_list_length(&source_p->preClient->dnsbl_queries) > 0)
 		return -1;
 
-	client_p->localClient->last = CurrentTime;
+	client_p->localClient->last = rb_current_time();
 	/* Straight up the maximum rate of flooding... */
 	source_p->localClient->allow_read = MAX_FLOOD_BURST;
 
@@ -293,17 +289,21 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	/* Apply nick override */
 	if(*source_p->preClient->spoofnick)
 	{
+		char note[NICKLEN + 10];
+
 		del_from_client_hash(source_p->name, source_p);
-		strlcpy(source_p->name, source_p->preClient->spoofnick, NICKLEN + 1);
+		rb_strlcpy(source_p->name, source_p->preClient->spoofnick, NICKLEN + 1);
 		add_to_client_hash(source_p->name, source_p);
-		rb_note(source_p->localClient->F->fd, "Nick: %s", source_p->name);
+
+		rb_snprintf(note, NICKLEN + 10, "Nick: %s", source_p->name);
+		rb_note(source_p->localClient->F, note);
 	}
 
 	if(!valid_hostname(source_p->host))
 	{
 		sendto_one_notice(source_p, ":*** Notice -- You have an illegal character in your hostname");
 
-		strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
+		rb_strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
  	}
  
 
@@ -322,7 +322,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
 		if(IsNeedIdentd(aconf))
 		{
-			ServerStats->is_ref++;
+			ServerStats.is_ref++;
 			sendto_one_notice(source_p, ":*** Notice -- You need to install identd to use this server");
 			exit_client(client_p, source_p, &me, "Install identd");
 			return (CLIENT_EXITED);
@@ -349,7 +349,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
 	if(IsNeedSasl(aconf) && !*user->suser)
 	{
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 		sendto_one_notice(source_p, ":*** Notice -- You need to identify via SASL to use this server");
 		exit_client(client_p, source_p, &me, "SASL access only");
 		return (CLIENT_EXITED);
@@ -369,7 +369,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
 		if(strcmp(encr, aconf->passwd))
 		{
-			ServerStats->is_ref++;
+			ServerStats.is_ref++;
 			sendto_one(source_p, form_str(ERR_PASSWDMISMATCH), me.name, source_p->name);
 			exit_client(client_p, source_p, &me, "Bad Password");
 			return (CLIENT_EXITED);
@@ -380,7 +380,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 		if(source_p->localClient->passwd)
 		{
 			memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
-			MyFree(source_p->localClient->passwd);
+			rb_free(source_p->localClient->passwd);
 			source_p->localClient->passwd = NULL;
 		}
 	}
@@ -403,7 +403,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 		sendto_realops_snomask(SNO_FULL, L_ALL,
 				     "Too many clients, rejecting %s[%s].", source_p->name, source_p->host);
 
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 		exit_client(client_p, source_p, &me, "Sorry, server is full - try later");
 		return (CLIENT_EXITED);
 	}
@@ -412,7 +412,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	if(!IsExemptKline(source_p) &&
 	   (xconf = find_xline(source_p->info, 1)) != NULL)
 	{
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 		add_reject(source_p, xconf->name, NULL);
 		exit_client(client_p, source_p, &me, "Bad user info");
 		return CLIENT_EXITED;
@@ -434,7 +434,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 			substitution_append_var(&varlist, "dnsbl-host", source_p->preClient->dnsbl_listed->host);
 			substitution_append_var(&varlist, "network-name", ServerInfo.network_name);
 
-			ServerStats->is_ref++;
+			ServerStats.is_ref++;
 
 			sendto_one(source_p, form_str(ERR_YOUREBANNEDCREEP),
 					me.name, source_p->name,
@@ -458,7 +458,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 		sendto_realops_snomask(SNO_REJ, L_ALL,
 				     "Invalid username: %s (%s@%s)",
 				     source_p->name, source_p->username, source_p->host);
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 		sendto_one_notice(source_p, ":*** Your username is invalid. Please make sure that your username contains "
 					    "only alphanumeric characters.");
 		rb_sprintf(tmpstr2, "Invalid username [%s]", source_p->username);
@@ -469,14 +469,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	/* end of valid user name check */
 
 	/* Store original hostname -- jilles */
-	strlcpy(source_p->orighost, source_p->host, HOSTLEN + 1);
+	rb_strlcpy(source_p->orighost, source_p->host, HOSTLEN + 1);
 
 	/* Spoof user@host */
 	if(*source_p->preClient->spoofuser)
-		strlcpy(source_p->username, source_p->preClient->spoofuser, USERLEN + 1);
+		rb_strlcpy(source_p->username, source_p->preClient->spoofuser, USERLEN + 1);
 	if(*source_p->preClient->spoofhost)
 	{
-		strlcpy(source_p->host, source_p->preClient->spoofhost, HOSTLEN + 1);
+		rb_strlcpy(source_p->host, source_p->preClient->spoofhost, HOSTLEN + 1);
 		if (irccmp(source_p->host, source_p->orighost))
 			SetDynSpoof(source_p);
 	}
@@ -493,7 +493,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	/* To avoid inconsistencies, do not abort the registration
 	 * starting from this point -- jilles
 	 */
-	inetntop_sock((struct sockaddr *)&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
+	rb_inet_ntop_sock((struct sockaddr *)&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
 
 	sendto_realops_snomask(SNO_CCONN, L_ALL,
 			     "Client connecting: %s (%s@%s) [%s] {%s} [%s]",
@@ -521,6 +521,9 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 		add_to_id_hash(source_p->id, source_p);
 	}
 
+	if (IsSSL(source_p))
+		source_p->umodes |= UMODE_SSLCLIENT;
+
 	if (source_p->umodes & UMODE_INVISIBLE)
 		Count.invisi++;
 
@@ -579,6 +582,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 	char *p;
 	hook_data_umode_changed hdata;
 	hook_data_client hdata2;
+	char sockhost[HOSTLEN];
 
 	if(MyClient(source_p))
 		send_umode(source_p, source_p, 0, 0, ubuf);
@@ -591,70 +595,48 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 		ubuf[1] = '\0';
 	}
 
-	/* if it has an ID, introduce it with its id to TS6 servers,
-	 * otherwise introduce it normally to all.
-	 */
-	if(has_id(source_p))
+	s_assert(has_id(source_p));
+
+	if(source_p->sockhost[0] == ':')
 	{
-		char sockhost[HOSTLEN];
-		if(source_p->sockhost[0] == ':')
-		{
-			sockhost[0] = '0';
-			sockhost[1] = '\0';
-			strlcat(sockhost, source_p->sockhost, sizeof(sockhost));
-		} else
-			strcpy(sockhost, source_p->sockhost);
+		sockhost[0] = '0';
+		sockhost[1] = '\0';
+		rb_strlcat(sockhost, source_p->sockhost, sizeof(sockhost));
+	} else
+		strcpy(sockhost, source_p->sockhost);
 		
-		if (use_euid)
-			sendto_server(client_p, NULL, CAP_EUID | CAP_TS6, NOCAPS,
-					":%s EUID %s %d %ld %s %s %s %s %s %s %s :%s",
-					source_p->servptr->id, nick,
-					source_p->hopcount + 1,
-					(long) source_p->tsinfo, ubuf,
-					source_p->username, source_p->host,
-					IsIPSpoof(source_p) ? "0" : sockhost,
-					source_p->id,
-					IsDynSpoof(source_p) ? source_p->orighost : "*",
-					EmptyString(source_p->user->suser) ? "*" : source_p->user->suser,
-					source_p->info);
-
-		sendto_server(client_p, NULL, CAP_TS6, use_euid ? CAP_EUID : NOCAPS,
-			      ":%s UID %s %d %ld %s %s %s %s %s :%s",
-			      source_p->servptr->id, nick,
-			      source_p->hopcount + 1,
-			      (long) source_p->tsinfo, ubuf,
-			      source_p->username, source_p->host,
-			      IsIPSpoof(source_p) ? "0" : sockhost,
-			      source_p->id, source_p->info);
-
-		sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-			      "NICK %s %d %ld %s %s %s %s :%s",
-			      nick, source_p->hopcount + 1,
-			      (long) source_p->tsinfo,
-			      ubuf, source_p->username, source_p->host,
-			      source_p->servptr->name, source_p->info);
-	}
-	else
-		sendto_server(client_p, NULL, NOCAPS, NOCAPS,
-			      "NICK %s %d %ld %s %s %s %s :%s",
-			      nick, source_p->hopcount + 1,
-			      (long) source_p->tsinfo,
-			      ubuf, source_p->username, source_p->host,
-			      source_p->servptr->name, source_p->info);
+	if (use_euid)
+		sendto_server(client_p, NULL, CAP_EUID | CAP_TS6, NOCAPS,
+				":%s EUID %s %d %ld %s %s %s %s %s %s %s :%s",
+				source_p->servptr->id, nick,
+				source_p->hopcount + 1,
+				(long) source_p->tsinfo, ubuf,
+				source_p->username, source_p->host,
+				IsIPSpoof(source_p) ? "0" : sockhost,
+				source_p->id,
+				IsDynSpoof(source_p) ? source_p->orighost : "*",
+				EmptyString(source_p->user->suser) ? "*" : source_p->user->suser,
+				source_p->info);
+
+	sendto_server(client_p, NULL, CAP_TS6, use_euid ? CAP_EUID : NOCAPS,
+		      ":%s UID %s %d %ld %s %s %s %s %s :%s",
+		      source_p->servptr->id, nick,
+		      source_p->hopcount + 1,
+		      (long) source_p->tsinfo, ubuf,
+		      source_p->username, source_p->host,
+		      IsIPSpoof(source_p) ? "0" : sockhost,
+		      source_p->id, source_p->info);
 
 	if (IsDynSpoof(source_p))
 	{
 		sendto_server(client_p, NULL, CAP_TS6, use_euid ? CAP_EUID : NOCAPS, ":%s ENCAP * REALHOST %s",
 				use_id(source_p), source_p->orighost);
-		sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s ENCAP * REALHOST %s",
-				source_p->name, source_p->orighost);
 	}
+
 	if (!EmptyString(source_p->user->suser))
 	{
 		sendto_server(client_p, NULL, CAP_TS6, use_euid ? CAP_EUID : NOCAPS, ":%s ENCAP * LOGIN %s",
 				use_id(source_p), source_p->user->suser);
-		sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s ENCAP * LOGIN %s",
-				source_p->name, source_p->user->suser);
 	}
 
 	if(MyConnect(source_p) && source_p->localClient->passwd)
@@ -676,7 +658,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 						source_p->localClient->passwd);
 		}
 		memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
-		MyFree(source_p->localClient->passwd);
+		rb_free(source_p->localClient->passwd);
 		source_p->localClient->passwd = NULL;
 	}
 
@@ -811,16 +793,7 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
 	if(IsConfExemptKline(aconf))
 	{
 		SetExemptKline(source_p);
-		sendto_one_notice(source_p, ":*** You are exempt from K/G/X lines. congrats.");
-	}
-
-	if(IsConfExemptGline(aconf))
-	{
-		SetExemptGline(source_p);
-
-		/* dont send both a kline and gline exempt notice */
-		if(!IsConfExemptKline(aconf))
-			sendto_one_notice(source_p, ":*** You are exempt from G lines.");
+		sendto_one_notice(source_p, ":*** You are exempt from K/X lines. congrats.");
 	}
 
 	if(IsConfExemptDNSBL(aconf))
@@ -990,7 +963,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 					}
 					source_p->flags2 &= ~OPER_FLAGS;
 
-					MyFree(source_p->localClient->opername);
+					rb_free(source_p->localClient->opername);
 					source_p->localClient->opername = NULL;
 
 					rb_dlinkFindDestroy(source_p, &local_oper_list);
@@ -1006,6 +979,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
 		/* can only be set on burst */
 		case 'S':
+		case 'Z':
 		case ' ':
 		case '\n':
 		case '\r':
@@ -1277,7 +1251,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 	SetExemptKline(source_p);
 
 	source_p->flags2 |= oper_p->flags;
-	DupString(source_p->localClient->opername, oper_p->name);
+	source_p->localClient->opername = rb_strdup(oper_p->name);
 
 	rb_dlinkAddAlloc(source_p, &local_oper_list);
 	rb_dlinkAddAlloc(source_p, &oper_list);
@@ -1368,7 +1342,7 @@ construct_umodebuf(void)
 
 void
 change_nick_user_host(struct Client *target_p,	const char *nick, const char *user,
-		      const char *host, int newts, char *format, ...)
+		      const char *host, int newts, const char *format, ...)
 {
 	rb_dlink_node *ptr;
 	struct Channel *chptr;
@@ -1441,14 +1415,14 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 				target_p->host, nick);
 	}
 
-	strlcpy(target_p->username, user, sizeof target_p->username);
-	strlcpy(target_p->host, host, sizeof target_p->host);
+	rb_strlcpy(target_p->username, user, sizeof target_p->username);
+	rb_strlcpy(target_p->host, host, sizeof target_p->host);
 
 	if (changed)
 		add_history(target_p, 1);
 
 	del_from_client_hash(target_p->name, target_p);
-	strlcpy(target_p->name, nick, NICKLEN);
+	rb_strlcpy(target_p->name, nick, NICKLEN);
 	add_to_client_hash(target_p->name, target_p);
 
 	if(changed)