X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..b3b2ed9780cba27094b31440e8c2fee12cc3dd45:/modules/core/m_squit.c

diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c
index cf7a761..587b851 100644
--- a/modules/core/m_squit.c
+++ b/modules/core/m_squit.c
@@ -21,17 +21,17 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_squit.c 698 2006-02-04 18:26:55Z jilles $
+ *  $Id: m_squit.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"		/* FALSE bleah */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "msg.h"
@@ -50,7 +50,7 @@ struct Message squit_msgtab = {
 
 mapi_clist_av1 squit_clist[] = { &squit_msgtab, NULL };
 
-DECLARE_MODULE_AV1(squit, NULL, NULL, squit_clist, NULL, NULL, "$Revision: 698 $");
+DECLARE_MODULE_AV1(squit, NULL, NULL, squit_clist, NULL, NULL, "$Revision: 3161 $");
 
 struct squit_parms
 {
@@ -64,7 +64,6 @@ static struct squit_parms *find_squit(struct Client *client_p,
 
 /*
  * mo_squit - SQUIT message handler
- *      parv[0] = sender prefix
  *      parv[1] = server name
  *      parv[2] = comment
  */
@@ -106,7 +105,6 @@ mo_squit(struct Client *client_p, struct Client *source_p, int parc, const char
 
 /*
  * ms_squit - SQUIT message handler
- *      parv[0] = sender prefix
  *      parv[1] = server name
  *      parv[2] = comment
  */
@@ -148,12 +146,7 @@ ms_squit(struct Client *client_p, struct Client *source_p, int parc, const char
 			      ":%s WALLOPS :Remote SQUIT %s from %s (%s)",
 			      me.id, target_p->name, source_p->name, comment);
 
-		sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
-			      ":%s WALLOPS :Remote SQUIT %s from %s (%s)",
-			      me.name, target_p->name, source_p->name, comment);
-
-		ilog(L_SERVER, "SQUIT From %s : %s (%s)", parv[0], target_p->name, comment);
-
+		ilog(L_SERVER, "SQUIT From %s : %s (%s)", source_p->name, target_p->name, comment);
 	}
 	exit_client(client_p, target_p, source_p, comment);
 	return 0;
@@ -174,7 +167,7 @@ find_squit(struct Client *client_p, struct Client *source_p, const char *server)
 	static struct squit_parms found_squit;
 	struct Client *target_p = NULL;
 	struct Client *p;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 
 	/* must ALWAYS be reset */
 	found_squit.target_p = NULL;
@@ -186,7 +179,7 @@ find_squit(struct Client *client_p, struct Client *source_p, const char *server)
 	 ** when the command is issued by an oper.
 	 */
 
-	DLINK_FOREACH(ptr, global_serv_list.head)
+	RB_DLINK_FOREACH(ptr, global_serv_list.head)
 	{
 		p = ptr->data;
 		if(IsServer(p) || IsMe(p))
@@ -210,8 +203,8 @@ find_squit(struct Client *client_p, struct Client *source_p, const char *server)
 		if(IsClient(client_p))
 		{
 			if(MyClient(client_p))
-				sendto_one(source_p, ":%s NOTICE %s :You are trying to squit me.",
-					   me.name, client_p->name);
+				sendto_one_notice(source_p, ":You are trying to squit me.");
+
 			return NULL;
 		}
 		else