X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/5b0a527927c6c5f4decdc33cc06c24f4bc17f61f..8097430a810ac1535fe5304f74991b16ff58b064:/modules/core/m_server.c

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 72c9b84..fc9a453 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -64,7 +64,6 @@ static int set_server_gecos(struct Client *, const char *);
 
 /*
  * mr_server - SERVER message handler
- *      parv[0] = sender prefix
  *      parv[1] = servername
  *      parv[2] = serverinfo/hopcount
  *      parv[3] = serverinfo
@@ -76,6 +75,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 	const char *name;
 	struct Client *target_p;
 	int hop;
+	struct Capability *cap;
 
 	name = parv[1];
 	hop = atoi(parv[2]);
@@ -109,6 +109,23 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 
+	/* check to ensure any "required" caps are set. --nenolod */
+	for (cap = captab; cap->name; cap++)
+	{
+		if (!cap->required)
+			continue;
+
+		if (!(client_p->localClient->caps & cap->cap))
+		{
+			char exitbuf[BUFSIZE];
+
+			rb_snprintf(exitbuf, BUFSIZE, "Missing required CAPAB [%s]", cap->name);
+			exit_client(client_p, client_p, client_p, exitbuf);
+
+			return 0;
+		}
+	}
+
 	/* Now we just have to call check_server and everything should be
 	 * check for us... -A1kmm. */
 	switch (check_server(name, client_p))
@@ -206,13 +223,24 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		 * Definitely don't do that here. This is from an unregistered
 		 * connect - A1kmm.
 		 */
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
-				     "Attempt to re-introduce server %s from %s",
-				     name, "[@255.255.255.255]");
-		ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
-				name, log_client_name(client_p, SHOW_IP));
+		if (target_p->servptr->flags & FLAGS_SERVICE)
+		{
+			/* Assume any servers introduced by services
+			 * are jupes.
+			 * -- jilles
+			 */
+			sendto_one(client_p, "ERROR :Server juped.");
+		}
+		else
+		{
+			sendto_realops_snomask(SNO_GENERAL, L_ALL,
+					     "Attempt to re-introduce server %s from %s",
+					     name, "[@255.255.255.255]");
+			ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
+					name, log_client_name(client_p, SHOW_IP));
 
-		sendto_one(client_p, "ERROR :Server already exists.");
+			sendto_one(client_p, "ERROR :Server already exists.");
+		}
 		exit_client(client_p, client_p, client_p, "Server Exists");
 		return 0;
 	}
@@ -250,7 +278,6 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 
 /*
  * ms_server - SERVER message handler
- *      parv[0] = sender prefix
  *      parv[1] = servername
  *      parv[2] = serverinfo/hopcount
  *      parv[3] = serverinfo
@@ -332,11 +359,6 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 	 * add it to list and propagate word to my other
 	 * server links...
 	 */
-	if(parc == 1 || EmptyString(info))
-	{
-		sendto_one(client_p, "ERROR :No server info specified for %s", name);
-		return 0;
-	}
 
 	/*
 	 * See if the newly found server is behind a guaranteed
@@ -388,7 +410,10 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		ilog(L_SERVER, "Non-Hub link %s introduced %s.",
 			client_p->name, name);
 
-		exit_client(NULL, client_p, &me, "No matching hub_mask.");
+		rb_snprintf(squitreason, sizeof squitreason,
+				"No matching hub_mask for %s",
+				name);
+		exit_client(NULL, client_p, &me, squitreason);
 		return 0;
 	}
 
@@ -402,7 +427,10 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		ilog(L_SERVER, "Link %s introduced leafed server %s.",
 			client_p->name, name);	
 
-		exit_client(NULL, client_p, &me, "Leafed Server.");
+		rb_snprintf(squitreason, sizeof squitreason,
+				"Matching leaf_mask for %s",
+				name);
+		exit_client(NULL, client_p, &me, squitreason);
 		return 0;
 	}
 
@@ -550,26 +578,32 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	/* no matching hub_mask */
 	if(!hlined)
 	{
-		sendto_one(client_p, "ERROR :No matching hub_mask");
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Non-Hub link %s introduced %s.",
 				     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.");
+
+		rb_snprintf(squitreason, sizeof squitreason,
+				"No matching hub_mask for %s",
+				parv[1]);
+		exit_client(NULL, client_p, &me, squitreason);
 		return 0;
 	}
 
 	/* matching leaf_mask */
 	if(llined)
 	{
-		sendto_one(client_p, "ERROR :Matching leaf_mask");
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s introduced leafed server %s.",
 				     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.");
+
+		rb_snprintf(squitreason, sizeof squitreason,
+				"Matching leaf_mask for %s",
+				parv[1]);
+		exit_client(NULL, client_p, &me, squitreason);
 		return 0;
 	}
 
@@ -626,7 +660,6 @@ set_server_gecos(struct Client *client_p, const char *info)
 	{
 		char *p;
 		char *s;
-		char *t;
 
 		s = LOCAL_COPY(info);
 
@@ -635,7 +668,7 @@ set_server_gecos(struct Client *client_p, const char *info)
 			*p = '\0';
 
 		/* check for a ] which would symbolise an [IP] */
-		if((t = strchr(s, ']')))
+		if(strchr(s, ']'))
 		{
 			/* set s to after the first space */
 			if(p)