X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..1548c140218b956485b3fd5c386447a2add59864:/modules/core/m_server.c

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 82f6c54a..e0702bfd 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -20,98 +20,112 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_server.c 2733 2006-11-10 00:04:08Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"		/* client struct */
-#include "common.h"		/* TRUE bleah */
-#include "event.h"
 #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 */
 #include "s_newconf.h"
-#include "s_log.h"		/* log level defines */
+#include "logger.h"		/* log level defines */
 #include "s_serv.h"		/* server_estab, check_server */
 #include "s_stats.h"		/* ServerStats */
-#include "scache.h"		/* find_or_add */
+#include "scache.h"
 #include "send.h"		/* sendto_one */
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
 
-static int mr_server(struct Client *, struct Client *, int, const char **);
-static int ms_server(struct Client *, struct Client *, int, const char **);
-static int ms_sid(struct Client *, struct Client *, int, const char **);
+static const char server_desc[] =
+	"Provides the TS6 commands to introduce a new server to the network";
+
+static void mr_server(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_server(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_sid(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
+static bool bogus_host(const char *host);
+static void set_server_gecos(struct Client *, const char *);
 
 struct Message server_msgtab = {
-	"SERVER", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
+	"SERVER", 0, 0, 0, 0,
 	{{mr_server, 4}, mg_reg, mg_ignore, {ms_server, 4}, mg_ignore, mg_reg}
 };
 struct Message sid_msgtab = {
-	"SID", 0, 0, 0, MFLG_SLOW,
+	"SID", 0, 0, 0, 0,
 	{mg_ignore, mg_reg, mg_ignore, {ms_sid, 5}, mg_ignore, mg_reg}
 };
 
 mapi_clist_av1 server_clist[] = { &server_msgtab, &sid_msgtab, NULL };
 
-DECLARE_MODULE_AV1(server, NULL, NULL, server_clist, NULL, NULL, "$Revision: 2733 $");
-
-int bogus_host(const char *host);
-struct Client *server_exists(const char *);
-static int set_server_gecos(struct Client *, const char *);
+DECLARE_MODULE_AV2(server, NULL, NULL, server_clist, NULL, NULL, NULL, NULL, server_desc);
 
 /*
  * mr_server - SERVER message handler
- *      parv[0] = sender prefix
  *      parv[1] = servername
  *      parv[2] = serverinfo/hopcount
  *      parv[3] = serverinfo
  */
-static int
-mr_server(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	char info[REALLEN + 1];
 	const char *name;
 	struct Client *target_p;
 	int hop;
+	unsigned int required_mask;
+	const char *missing;
+	int ret;
 
 	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, L_NETWIDE,
+				"Server %s has unexpected name %s",
+				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");
+		return;
+	}
 
-	/* 
+	/*
 	 * Reject a direct nonTS server connection if we're TS_ONLY -orabidoo
 	 */
 	if(!DoesTS(client_p))
 	{
-		sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s dropped, non-TS server",
-				     get_server_name(client_p, HIDE_IP));
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s dropped, non-TS server",
+				     client_p->name);
 		exit_client(client_p, client_p, client_p, "Non-TS server");
-		return 0;
+		return;
 	}
 
 	if(bogus_host(name))
 	{
 		exit_client(client_p, client_p, client_p, "Bogus server name");
-		return 0;
+		return;
 	}
 
 	/* Now we just have to call check_server and everything should be
 	 * check for us... -A1kmm. */
-	switch (check_server(name, client_p))
+	ret = check_server(name, client_p);
+	switch (ret)
 	{
+	case 0:
+		/* success */
+		break;
 	case -1:
 		if(ConfigFileEntry.warn_no_nline)
 		{
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
+			sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 					     "Unauthorised server connection attempt from %s: "
 					     "No entry for servername %s",
-					     get_server_name(client_p, HIDE_IP), name);
+					     "[@255.255.255.255]", name);
 
 			ilog(L_SERVER, "Access denied, no connect block for server %s%s",
 			     EmptyString(client_p->name) ? name : "",
@@ -119,55 +133,135 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		}
 
 		exit_client(client_p, client_p, client_p, "Invalid servername.");
-		return 0;
+		return;
 		/* NOT REACHED */
 		break;
 
 	case -2:
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				     "Unauthorised server connection attempt from %s: "
-				     "Bad password for server %s",
-				     get_server_name(client_p, HIDE_IP), name);
+				     "Bad credentials for server %s",
+				     "[@255.255.255.255]", name);
 
-		ilog(L_SERVER, "Access denied, invalid password for server %s%s",
+		ilog(L_SERVER, "Access denied, invalid credentials for server %s%s",
 		     EmptyString(client_p->name) ? name : "",
 		     log_client_name(client_p, SHOW_IP));
 
-		exit_client(client_p, client_p, client_p, "Invalid password.");
-		return 0;
+		exit_client(client_p, client_p, client_p, "Invalid credentials.");
+		return;
 		/* NOT REACHED */
 		break;
 
 	case -3:
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				     "Unauthorised server connection attempt from %s: "
 				     "Invalid host for server %s",
-				     get_server_name(client_p, HIDE_IP), name);
+				     "[@255.255.255.255]", name);
 
 		ilog(L_SERVER, "Access denied, invalid host for server %s%s",
 		     EmptyString(client_p->name) ? name : "",
 		     log_client_name(client_p, SHOW_IP));
 
 		exit_client(client_p, client_p, client_p, "Invalid host.");
-		return 0;
+		return;
 		/* NOT REACHED */
 		break;
 
 		/* servername is > HOSTLEN */
 	case -4:
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				     "Invalid servername %s from %s",
-				     name, get_server_name(client_p, HIDE_IP));
+				     name, "[@255.255.255.255]");
 		ilog(L_SERVER, "Access denied, invalid servername from %s",
 		     log_client_name(client_p, SHOW_IP));
 
 		exit_client(client_p, client_p, client_p, "Invalid servername.");
-		return 0;
+		return;
 		/* NOT REACHED */
 		break;
+	case -5:
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+		     "Connection from servername %s requires SSL/TLS but is plaintext",
+		     name);
+		ilog(L_SERVER, "Access denied, requires SSL/TLS but is plaintext from %s",
+		     log_client_name(client_p, SHOW_IP));
+
+		exit_client(client_p, client_p, client_p, "Access denied, requires SSL/TLS but is plaintext");
+		return;
+	case -6:
+		if (client_p->certfp)
+		{
+			sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+			     "Connection from servername %s has invalid certificate fingerprint %s",
+			     name, client_p->certfp);
+			ilog(L_SERVER, "Access denied, invalid certificate fingerprint %s from %s",
+			     client_p->certfp, log_client_name(client_p, SHOW_IP));
+			exit_client(client_p, client_p, client_p, "Invalid fingerprint.");
+		}
+		else
+		{
+			sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+			    "Connection from servername %s failed certificate validation",
+			    name);
+			ilog(L_SERVER, "Access denied; certificate validation failed for certificate from %s",
+			    log_client_name(client_p, SHOW_IP));
+			exit_client(client_p, client_p, client_p, "Invalid certificate.");
+		}
+
+		return;
+	case -7:
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+		     "Connection from servername %s rejected, no more connections allowed in class",
+		     name);
+		ilog(L_SERVER, "Access denied, no more connections allowed in class for %s",
+		     log_client_name(client_p, SHOW_IP));
+
+		exit_client(client_p, client_p, client_p, "Access denied, no more connections allowed in class");
+		return;
+	default:
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+		     "Connection from servername %s rejected, unknown error %d",
+		     name, ret);
+		ilog(L_SERVER, "Access denied, unknown error %d for server %s%s", ret,
+		     EmptyString(client_p->name) ? name : "",
+		     log_client_name(client_p, SHOW_IP));
+
+		exit_client(client_p, client_p, client_p, "Unknown error.");
+		return;
+	}
+
+	/* require TS6 for direct links */
+	if(!IsCapable(client_p, CAP_TS6))
+	{
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+					"Link %s dropped, TS6 protocol is required", name);
+		exit_client(client_p, client_p, client_p, "Incompatible TS version");
+		return;
+	}
+
+	/* check to ensure any "required" caps are set. --nenolod */
+	required_mask = capability_index_get_required(serv_capindex);
+	if (!IsCapable(client_p, required_mask))
+	{
+		missing = capability_index_list(serv_capindex, required_mask &
+				~client_p->localClient->caps);
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+					"Link %s dropped, required CAPABs [%s] are missing",
+					name, missing);
+		ilog(L_SERVER, "Link %s%s dropped, required CAPABs [%s] are missing",
+				EmptyString(client_p->name) ? name : "",
+				log_client_name(client_p, SHOW_IP), missing);
+		/* Do not use '[' in the below message because it would cause
+		 * it to be considered potentially unsafe (might disclose IP
+		 * addresses)
+		 */
+		sendto_one(client_p, "ERROR :Missing required CAPABs (%s)", missing);
+		exit_client(client_p, client_p, client_p, "Missing required CAPABs");
+
+		return;
 	}
 
-	if((target_p = server_exists(name)))
+	if((target_p = find_server(NULL, name)))
 	{
 		/*
 		 * This link is trying feed me a server that I already have
@@ -180,32 +274,47 @@ 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, get_server_name(client_p, HIDE_IP));
-		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_NETWIDE,
+					     "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;
+		return;
 	}
 
-	if(has_id(client_p) && (target_p = find_id(client_p->id)) != NULL)
-	{
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
-				     "Attempt to re-introduce SID %s from %s%s",
-				     client_p->id,
-				     EmptyString(client_p->name) ? name : "",
-				     get_server_name(client_p, HIDE_IP));
-		ilog(L_SERVER, "Attempt to re-introduce SID %s from %s%s",
-				client_p->id,
-				EmptyString(client_p->name) ? name : "",
-				log_client_name(client_p, SHOW_IP));
-
-		sendto_one(client_p, "ERROR :SID already exists.");
-		exit_client(client_p, client_p, client_p, "SID Exists");
-		return 0;
+	if (client_p->preClient && !EmptyString(client_p->preClient->id)) {
+		if ((target_p = find_id(client_p->preClient->id)) != NULL) {
+			sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+					"Attempt to re-introduce SID %s from %s%s (already in use by %s)",
+					client_p->preClient->id,
+					EmptyString(client_p->name) ? name : "",
+					client_p->name, target_p->name);
+			ilog(L_SERVER, "Attempt to re-introduce SID %s from %s%s (already in use by %s)",
+					client_p->preClient->id,
+					EmptyString(client_p->name) ? name : "",
+					log_client_name(client_p, SHOW_IP),
+					target_p->name);
+
+			sendto_one(client_p, "ERROR :SID already exists.");
+			exit_client(client_p, client_p, client_p, "SID Exists");
+			return;
+		} else {
+			rb_strlcpy(client_p->id, client_p->preClient->id, sizeof(client_p->id));
+		}
 	}
 
 	/*
@@ -213,40 +322,34 @@ 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);
-
-	return 0;
 }
 
 /*
  * ms_server - SERVER message handler
- *      parv[0] = sender prefix
  *      parv[1] = servername
  *      parv[2] = serverinfo/hopcount
  *      parv[3] = serverinfo
  */
-static int
-ms_server(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	char info[REALLEN + 1];
 	/* same size as in s_misc.c */
 	const char *name;
 	struct Client *target_p;
-	struct remote_conf *hub_p;
 	hook_data_client hdata;
 	int hop;
-	int hlined = 0;
-	int llined = 0;
-	dlink_node *ptr;
+	char squitreason[160];
 
 	name = parv[1];
 	hop = atoi(parv[2]);
-	strlcpy(info, parv[3], sizeof(info));
+	rb_strlcpy(info, parv[3], sizeof(info));
 
-	if((target_p = server_exists(name)))
+	if(find_server(NULL, name))
 	{
 		/*
 		 * This link is trying feed me a server that I already have
@@ -264,27 +367,19 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		 * that already exists, then sends you a client burst, you squit the
 		 * server, but you keep getting the burst of clients on a server that
 		 * doesnt exist, although ircd can handle it, its not a realistic
-		 * solution.. --fl_ 
+		 * solution.. --fl_
 		 */
-		/* It is behind a host-masked server. Completely ignore the
-		 * server message(don't propagate or we will delink from whoever
-		 * we propagate to). -A1kmm */
-		if(irccmp(target_p->name, name) && target_p->from == client_p)
-			return 0;
-
-		sendto_one(client_p, "ERROR :Server %s already exists", name);
-
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
-				     "Link %s cancelled, server %s already exists",
-				     get_server_name(client_p, SHOW_IP), name);
 		ilog(L_SERVER, "Link %s cancelled, server %s already exists",
 			client_p->name, name);
 
-		exit_client(client_p, client_p, &me, "Server Exists");
-		return 0;
+		snprintf(squitreason, sizeof squitreason,
+				"Server %s already exists",
+				name);
+		exit_client(client_p, client_p, &me, squitreason);
+		return;
 	}
 
-	/* 
+	/*
 	 * User nicks never have '.' in them and server names
 	 * must always have '.' in them.
 	 */
@@ -296,14 +391,14 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		 * for a while and servers to send stuff to the wrong place.
 		 */
 		sendto_one(client_p, "ERROR :Nickname %s already exists!", name);
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				     "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);
 
 		exit_client(client_p, client_p, client_p, "Nick as Server");
-		return 0;
+		return;
 	}
 
 	/*
@@ -312,115 +407,37 @@ 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
-	 * leaf. If so, close the link.
-	 *
-	 */
-	DLINK_FOREACH(ptr, hubleaf_conf_list.head)
-	{
-		hub_p = ptr->data;
-
-		if(match(hub_p->server, client_p->name) && match(hub_p->host, name))
-		{
-			if(hub_p->flags & CONF_HUB)
-				hlined++;
-			else
-				llined++;
-		}
-	}
-
-	/* Ok, this way this works is
-	 *
-	 * A server can have a CONF_HUB allowing it to introduce servers
-	 * behind it.
-	 *
-	 * connect {
-	 *            name = "irc.bighub.net";
-	 *            hub_mask="*";
-	 *            ...
-	 * 
-	 * That would allow "irc.bighub.net" to introduce anything it wanted..
-	 *
-	 * However
-	 *
-	 * connect {
-	 *            name = "irc.somehub.fi";
-	 *            hub_mask="*";
-	 *            leaf_mask="*.edu";
-	 *...
-	 * Would allow this server in finland to hub anything but
-	 * .edu's
-	 */
-
-	/* Ok, check client_p can hub the new server, and make sure it's not a LL */
-	if(!hlined)
-	{
-		/* 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);
-		ilog(L_SERVER, "Non-Hub link %s introduced %s.",
-			client_p->name, name);
-
-		exit_client(NULL, client_p, &me, "No matching hub_mask.");
-		return 0;
-	}
-
-	/* Check for the new server being leafed behind this HUB */
-	if(llined)
-	{
-		/* 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);
-		ilog(L_SERVER, "Link %s introduced leafed server %s.",
-			client_p->name, name);	
-
-		exit_client(NULL, client_p, &me, "Leafed Server.");
-		return 0;
-	}
-
-
 
 	if(strlen(name) > HOSTLEN)
 	{
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				     "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);
 
 		exit_client(NULL, client_p, &me, "Invalid servername introduced.");
-		return 0;
+		return;
 	}
 
 	target_p = make_client(client_p);
 	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);
 
-	target_p->serv->up = find_or_add(source_p->name);
-
-	if(has_id(source_p))
-		target_p->serv->upid = source_p->id;
-
 	target_p->servptr = source_p;
 
 	SetServer(target_p);
 
-	dlinkAddTail(target_p, &target_p->node, &global_client_list);
-	dlinkAddTailAlloc(target_p, &global_serv_list);
+	rb_dlinkAddTail(target_p, &target_p->node, &global_client_list);
+	rb_dlinkAddTailAlloc(target_p, &global_serv_list);
 	add_to_client_hash(target_p->name, target_p);
-	dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+	rb_dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+
+	target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));
 
 	sendto_server(client_p, NULL, NOCAPS, NOCAPS,
 		      ":%s SERVER %s %d :%s%s",
@@ -436,152 +453,98 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 	hdata.client = source_p;
 	hdata.target = target_p;
 	call_hook(h_server_introduced, &hdata);
-
-	return 0;
 }
 
-static int
-ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_sid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
-	struct remote_conf *hub_p;
 	hook_data_client hdata;
-	dlink_node *ptr;
-	int hop;
-	int hlined = 0;
-	int llined = 0;
-
-	hop = atoi(parv[2]);
+	char squitreason[160];
 
 	/* collision on the name? */
-	if((target_p = server_exists(parv[1])) != NULL)
+	if(find_server(NULL, parv[1]) != NULL)
 	{
-		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]);
 		ilog(L_SERVER, "Link %s cancelled, server %s already exists",
 			client_p->name, parv[1]);
 
-		exit_client(NULL, client_p, &me, "Server Exists");
-		return 0;
+		snprintf(squitreason, sizeof squitreason,
+				"Server %s already exists",
+				parv[1]);
+		exit_client(NULL, client_p, &me, squitreason);
+		return;
 	}
 
 	/* collision on the SID? */
 	if((target_p = find_id(parv[3])) != NULL)
 	{
-		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]);
-		ilog(L_SERVER, "Link %s cancelled, SID %s already exists",
-			client_p->name, parv[3]);
-
-		exit_client(NULL, client_p, &me, "Server Exists");
-		return 0;
+		sendto_wallops_flags(UMODE_WALLOP, &me,
+				     "Link %s cancelled, SID %s for server %s already in use by %s",
+				     client_p->name, parv[3], parv[1], target_p->name);
+		sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
+				     ":%s WALLOPS :Link %s cancelled, SID %s for server %s already in use by %s",
+				     me.id, client_p->name, parv[3], parv[1], target_p->name);
+		ilog(L_SERVER, "Link %s cancelled, SID %s for server %s already in use by %s",
+			client_p->name, parv[3], parv[1], target_p->name);
+
+		snprintf(squitreason, sizeof squitreason,
+				"SID %s for %s already in use by %s",
+				parv[3], parv[1], target_p->name);
+		exit_client(NULL, client_p, &me, squitreason);
+		return;
 	}
 
 	if(bogus_host(parv[1]) || strlen(parv[1]) > HOSTLEN)
 	{
 		sendto_one(client_p, "ERROR :Invalid servername");
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				     "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]);
 
 		exit_client(NULL, client_p, &me, "Bogus server name");
-		return 0;
+		return;
 	}
 
 	if(!IsDigit(parv[3][0]) || !IsIdChar(parv[3][1]) ||
 	   !IsIdChar(parv[3][2]) || parv[3][3] != '\0')
 	{
 		sendto_one(client_p, "ERROR :Invalid SID");
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				     "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]);
 
 		exit_client(NULL, client_p, &me, "Bogus SID");
-		return 0;
-	}
-
-	/* for the directly connected server:
-	 * H: allows it to introduce a server matching that mask
-	 * L: disallows it introducing a server matching that mask
-	 */
-	DLINK_FOREACH(ptr, hubleaf_conf_list.head)
-	{
-		hub_p = ptr->data;
-
-		if(match(hub_p->server, client_p->name) && match(hub_p->host, parv[1]))
-		{
-			if(hub_p->flags & CONF_HUB)
-				hlined++;
-			else
-				llined++;
-		}
-	}
-
-	/* 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.",
-				     get_server_name(client_p, SHOW_IP), 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.");
-		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.",
-				     get_server_name(client_p, SHOW_IP), parv[1]);
-		ilog(L_SERVER, "Link %s introduced leafed server %s.",
-			client_p->name, parv[1]);	
-		exit_client(NULL, client_p, &me, "Leafed Server.");
-		return 0;
+		return;
 	}
 
 	/* ok, alls good */
 	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]);
+	rb_strlcpy(target_p->id, parv[3], sizeof(target_p->id));
 	set_server_gecos(target_p, parv[4]);
 
-	target_p->serv->up = find_or_add(source_p->name);
-
-	if(has_id(source_p))
-		target_p->serv->upid = source_p->id;
-
 	target_p->servptr = source_p;
 	SetServer(target_p);
 
-	dlinkAddTail(target_p, &target_p->node, &global_client_list);
-	dlinkAddTailAlloc(target_p, &global_serv_list);
+	rb_dlinkAddTail(target_p, &target_p->node, &global_client_list);
+	rb_dlinkAddTailAlloc(target_p, &global_serv_list);
 	add_to_client_hash(target_p->name, target_p);
 	add_to_id_hash(target_p->id, target_p);
-	dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+	rb_dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+
+	target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));
 
 	sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
 		      ":%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);
@@ -593,8 +556,6 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	hdata.client = source_p;
 	hdata.target = target_p;
 	call_hook(h_server_introduced, &hdata);
-
-	return 0;
 }
 
 /* set_server_gecos()
@@ -603,7 +564,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
  * output	- none
  * side effects - servers gecos field is set
  */
-static int
+static void
 set_server_gecos(struct Client *client_p, const char *info)
 {
 	/* check the info for [IP] */
@@ -611,7 +572,6 @@ set_server_gecos(struct Client *client_p, const char *info)
 	{
 		char *p;
 		char *s;
-		char *t;
 
 		s = LOCAL_COPY(info);
 
@@ -620,7 +580,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)
@@ -657,28 +617,26 @@ 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));
-				return 1;
+				rb_strlcpy(client_p->info, s, sizeof(client_p->info));
+				return;
 			}
 		}
 	}
 
-	strlcpy(client_p->info, "(Unknown Location)", sizeof(client_p->info));
-
-	return 1;
+	rb_strlcpy(client_p->info, "(Unknown Location)", sizeof(client_p->info));
 }
 
 /*
  * bogus_host
  *
  * inputs	- hostname
- * output	- 1 if a bogus hostname input, 0 if its valid
+ * output	- true if a bogus hostname input, false if its valid
  * side effects	- none
  */
-int
+static bool
 bogus_host(const char *host)
 {
-	int bogus_server = 0;
+	bool bogus_server = false;
 	const char *s;
 	int dots = 0;
 
@@ -686,7 +644,7 @@ bogus_host(const char *host)
 	{
 		if(!IsServChar(*s))
 		{
-			bogus_server = 1;
+			bogus_server = true;
 			break;
 		}
 		if('.' == *s)
@@ -694,30 +652,7 @@ bogus_host(const char *host)
 	}
 
 	if(!dots || bogus_server)
-		return 1;
-
-	return 0;
-}
-
-/*
- * server_exists()
- * 
- * inputs	- servername
- * output	- 1 if server exists, 0 if doesnt exist
- */
-struct Client *
-server_exists(const char *servername)
-{
-	struct Client *target_p;
-	dlink_node *ptr;
-
-	DLINK_FOREACH(ptr, global_serv_list.head)
-	{
-		target_p = ptr->data;
-
-		if(match(target_p->name, servername) || match(servername, target_p->name))
-			return target_p;
-	}
+		return true;
 
-	return NULL;
+	return false;
 }