X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/8bd5767b953efd089e0467b02f897f77581e589d..43946961df9e7703c8877e4bbd9181507422429d:/modules/core/m_server.c

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 47c8816b..95926f10 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -28,7 +28,7 @@
 #include "client.h"		/* client struct */
 #include "common.h"		/* TRUE bleah */
 #include "hash.h"		/* add_to_client_hash */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"		/* me */
 #include "numeric.h"		/* ERR_xxx */
 #include "s_conf.h"		/* struct ConfItem */
@@ -79,13 +79,13 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	name = parv[1];
 	hop = atoi(parv[2]);
-	strlcpy(info, parv[3], sizeof(info));
+	rb_strlcpy(info, parv[3], sizeof(info));
 
 	if (IsHandshake(client_p) && irccmp(client_p->name, name))
 	{
 		sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
 				"Server %s has unexpected name %s",
-				get_server_name(client_p, HIDE_IP), name);
+				client_p->name, name);
 		ilog(L_SERVER, "Server %s has unexpected name %s",
 				log_client_name(client_p, SHOW_IP), name);
 		exit_client(client_p, client_p, client_p, "Server name mismatch");
@@ -98,7 +98,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 	if(!DoesTS(client_p))
 	{
 		sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s dropped, non-TS server",
-				     get_server_name(client_p, HIDE_IP));
+				     client_p->name);
 		exit_client(client_p, client_p, client_p, "Non-TS server");
 		return 0;
 	}
@@ -119,7 +119,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 			sendto_realops_snomask(SNO_GENERAL, L_ALL,
 					     "Unauthorised server connection attempt from %s: "
 					     "No entry for servername %s",
-					     get_server_name(client_p, HIDE_IP), name);
+					     client_p->name, name);
 
 			ilog(L_SERVER, "Access denied, no connect block for server %s%s",
 			     EmptyString(client_p->name) ? name : "",
@@ -135,7 +135,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
 				     "Unauthorised server connection attempt from %s: "
 				     "Bad password for server %s",
-				     get_server_name(client_p, HIDE_IP), name);
+				     client_p->name, name);
 
 		ilog(L_SERVER, "Access denied, invalid password for server %s%s",
 		     EmptyString(client_p->name) ? name : "",
@@ -150,7 +150,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Unauthorised server connection attempt from %s: "
 				     "Invalid host for server %s",
-				     get_server_name(client_p, HIDE_IP), name);
+				     client_p->name, name);
 
 		ilog(L_SERVER, "Access denied, invalid host for server %s%s",
 		     EmptyString(client_p->name) ? name : "",
@@ -165,7 +165,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 	case -4:
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Invalid servername %s from %s",
-				     name, get_server_name(client_p, HIDE_IP));
+				     name, client_p->name);
 		ilog(L_SERVER, "Access denied, invalid servername from %s",
 		     log_client_name(client_p, SHOW_IP));
 
@@ -184,6 +184,15 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 
+	/* require TS6 for direct links */
+	if(!IsCapable(client_p, CAP_TS6))
+	{
+		sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+					"Link %s dropped, TS6 protocol is required", name);
+		exit_client(client_p, client_p, client_p, "Incompatible TS version");
+		return 0;
+	}
+
 	if((target_p = find_server(NULL, name)))
 	{
 		/*
@@ -199,7 +208,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		 */
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Attempt to re-introduce server %s from %s",
-				     name, get_server_name(client_p, HIDE_IP));
+				     name, client_p->name);
 		ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
 				name, log_client_name(client_p, SHOW_IP));
 
@@ -214,7 +223,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 				     "Attempt to re-introduce SID %s from %s%s",
 				     client_p->id,
 				     EmptyString(client_p->name) ? name : "",
-				     get_server_name(client_p, HIDE_IP));
+				     client_p->name);
 		ilog(L_SERVER, "Attempt to re-introduce SID %s from %s%s",
 				client_p->id,
 				EmptyString(client_p->name) ? name : "",
@@ -230,7 +239,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 	 * C:line in client_p->name
 	 */
 
-	strlcpy(client_p->name, name, sizeof(client_p->name));
+	rb_strlcpy(client_p->name, name, sizeof(client_p->name));
 	set_server_gecos(client_p, info);
 	client_p->hopcount = hop;
 	server_estab(client_p);
@@ -261,7 +270,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	name = parv[1];
 	hop = atoi(parv[2]);
-	strlcpy(info, parv[3], sizeof(info));
+	rb_strlcpy(info, parv[3], sizeof(info));
 
 	if((target_p = find_server(NULL, name)))
 	{
@@ -293,7 +302,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s cancelled, server %s already exists",
-				     get_server_name(client_p, SHOW_IP), name);
+				     client_p->name, name);
 		ilog(L_SERVER, "Link %s cancelled, server %s already exists",
 			client_p->name, name);
 
@@ -315,7 +324,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_one(client_p, "ERROR :Nickname %s already exists!", name);
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s cancelled: Server/nick collision on %s",
-				     get_server_name(client_p, HIDE_IP), name);
+				     client_p->name, name);
 		ilog(L_SERVER, "Link %s cancelled: Server/nick collision on %s",
 			client_p->name, name);
 
@@ -381,7 +390,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		/* OOOPs nope can't HUB */
 		sendto_realops_snomask(SNO_GENERAL, L_ALL, "Non-Hub link %s introduced %s.",
-				     get_server_name(client_p, HIDE_IP), name);
+				     client_p->name, name);
 		ilog(L_SERVER, "Non-Hub link %s introduced %s.",
 			client_p->name, name);
 
@@ -395,7 +404,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		/* OOOPs nope can't HUB this leaf */
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s introduced leafed server %s.",
-				     get_server_name(client_p, HIDE_IP), name);
+				     client_p->name, name);
 		ilog(L_SERVER, "Link %s introduced leafed server %s.",
 			client_p->name, name);	
 
@@ -409,7 +418,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s introduced server with invalid servername %s",
-				     get_server_name(client_p, HIDE_IP), name);
+				     client_p->name, name);
 		ilog(L_SERVER, "Link %s introduced server with invalid servername %s",
 			client_p->name, name);
 
@@ -421,7 +430,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 	make_server(target_p);
 	target_p->hopcount = hop;
 
-	strlcpy(target_p->name, name, sizeof(target_p->name));
+	rb_strlcpy(target_p->name, name, sizeof(target_p->name));
 
 	set_server_gecos(target_p, info);
 
@@ -473,7 +482,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		sendto_one(client_p, "ERROR :Server %s already exists", parv[1]);
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s cancelled, server %s already exists",
-				     get_server_name(client_p, SHOW_IP), parv[1]);
+				     client_p->name, parv[1]);
 		ilog(L_SERVER, "Link %s cancelled, server %s already exists",
 			client_p->name, parv[1]);
 
@@ -487,7 +496,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		sendto_one(client_p, "ERROR :SID %s already exists", parv[3]);
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s cancelled, SID %s already exists",
-				     get_server_name(client_p, SHOW_IP), parv[3]);
+				     client_p->name, parv[3]);
 		ilog(L_SERVER, "Link %s cancelled, SID %s already exists",
 			client_p->name, parv[3]);
 
@@ -500,7 +509,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		sendto_one(client_p, "ERROR :Invalid servername");
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s cancelled, servername %s invalid",
-				     get_server_name(client_p, SHOW_IP), parv[1]);
+				     client_p->name, parv[1]);
 		ilog(L_SERVER, "Link %s cancelled, servername %s invalid",
 			client_p->name, parv[1]);
 
@@ -514,7 +523,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		sendto_one(client_p, "ERROR :Invalid SID");
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s cancelled, SID %s invalid",
-				     get_server_name(client_p, SHOW_IP), parv[3]);
+				     client_p->name, parv[3]);
 		ilog(L_SERVER, "Link %s cancelled, SID %s invalid",
 			client_p->name, parv[3]);
 
@@ -545,7 +554,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		sendto_one(client_p, "ERROR :No matching hub_mask");
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Non-Hub link %s introduced %s.",
-				     get_server_name(client_p, SHOW_IP), parv[1]);
+				     client_p->name, parv[1]);
 		ilog(L_SERVER, "Non-Hub link %s introduced %s.",
 			client_p->name, parv[1]);
 		exit_client(NULL, client_p, &me, "No matching hub_mask.");
@@ -558,7 +567,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		sendto_one(client_p, "ERROR :Matching leaf_mask");
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s introduced leafed server %s.",
-				     get_server_name(client_p, SHOW_IP), parv[1]);
+				     client_p->name, parv[1]);
 		ilog(L_SERVER, "Link %s introduced leafed server %s.",
 			client_p->name, parv[1]);	
 		exit_client(NULL, client_p, &me, "Leafed Server.");
@@ -569,7 +578,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	target_p = make_client(client_p);
 	make_server(target_p);
 
-	strlcpy(target_p->name, parv[1], sizeof(target_p->name));
+	rb_strlcpy(target_p->name, parv[1], sizeof(target_p->name));
 	target_p->hopcount = atoi(parv[2]);
 	strcpy(target_p->id, parv[3]);
 	set_server_gecos(target_p, parv[4]);
@@ -589,10 +598,6 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		      ":%s SID %s %d %s :%s%s",
 		      source_p->id, target_p->name, target_p->hopcount + 1,
 		      target_p->id, IsHidden(target_p) ? "(H) " : "", target_p->info);
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-		      ":%s SERVER %s %d :%s%s",
-		      source_p->name, target_p->name, target_p->hopcount + 1,
-		      IsHidden(target_p) ? "(H) " : "", target_p->info);
 
 	sendto_realops_snomask(SNO_EXTERNAL, L_ALL,
 			     "Server %s being introduced by %s", target_p->name, source_p->name);
@@ -668,13 +673,13 @@ set_server_gecos(struct Client *client_p, const char *info)
 			/* if there was a trailing space, s could point to \0, so check */
 			if(s && (*s != '\0'))
 			{
-				strlcpy(client_p->info, s, sizeof(client_p->info));
+				rb_strlcpy(client_p->info, s, sizeof(client_p->info));
 				return 1;
 			}
 		}
 	}
 
-	strlcpy(client_p->info, "(Unknown Location)", sizeof(client_p->info));
+	rb_strlcpy(client_p->info, "(Unknown Location)", sizeof(client_p->info));
 
 	return 1;
 }