X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/6a73262e4d8e33c23502e757c97fcc299e66c028..fb87421d0e13c6e62a7c7a62a597e3b53ef772ed:/src/parse.c

diff --git a/src/parse.c b/src/parse.c
index b26022d..c4f4c21 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -31,11 +31,10 @@
 #include "channel.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_stats.h"
 #include "send.h"
 #include "msg.h"
@@ -51,7 +50,7 @@ struct Dictionary *alias_dict = NULL;
  */
 static char *sender;
 
-/* parv[0] == source, and parv[LAST] == NULL */
+/* parv[0] is not used, and parv[LAST] == NULL */
 static char *para[MAXPARA + 2];
 
 static void cancel_clients(struct Client *, struct Client *, char *);
@@ -105,7 +104,7 @@ string_to_array(char *string, char **parv)
 		if(*buf == '\0')
 			return x;
 	}
-	/* we can go upto parv[MAXPARA], as parv[0] is taken by source */
+	/* we can go upto parv[MAXPARA], as parv[0] is skipped */
 	while (x < MAXPARA);
 
 	if(*p == ':')
@@ -132,7 +131,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 	struct Message *mptr;
 
 	s_assert(MyConnect(client_p));
-	s_assert(client_p->localClient->F->fd >= 0);
+	s_assert(client_p->localClient->F != NULL);
 	if(IsAnyDead(client_p))
 		return;
 
@@ -365,7 +364,7 @@ handle_command(struct Message *mptr, struct Client *client_p,
 		ilog(L_SERVER,
 		     "Insufficient parameters (%d < %d) for command '%s' from %s.",
 		     i, ehandler.min_para, mptr->cmd, client_p->name);
-		snprintf(squitreason, sizeof squitreason,
+		rb_snprintf(squitreason, sizeof squitreason,
 				"Insufficient parameters (%d < %d) for command '%s'",
 				i, ehandler.min_para, mptr->cmd);
 		exit_client(client_p, client_p, client_p, squitreason);
@@ -509,7 +508,7 @@ cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Message for %s[%s] from %s",
 				     source_p->name, source_p->from->name,
-				     get_server_name(client_p, SHOW_IP));
+				     client_p->name);
 	}
 	else
 	{
@@ -519,7 +518,7 @@ cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
 				     source_p->username,
 				     source_p->host,
 				     source_p->from->name,
-				     get_server_name(client_p, SHOW_IP));
+				     client_p->name);
 	}
 }
 
@@ -533,8 +532,10 @@ static void
 remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 {
 	int slen = strlen(lsender);
+	char sid[4];
+	struct Client *server;
 
-	/* meepfoo	is a nickname (KILL)
+	/* meepfoo	is a nickname (ignore)
 	 * #XXXXXXXX	is a UID (KILL)
 	 * #XX		is a SID (SQUIT)
 	 * meep.foo	is a server (SQUIT)
@@ -544,16 +545,28 @@ remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 	{
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Unknown prefix (%s) from %s, Squitting %s",
-				     lbuffer, get_server_name(client_p, SHOW_IP), lsender);
+				     lbuffer, client_p->name, lsender);
 
 		sendto_one(client_p,
 			   ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
 			   get_id(&me, client_p), lsender, 
 			   lbuffer, client_p->name);
 	}
+	else if(!IsDigit(lsender[0]))
+		;
+	else if(slen != 9)
+		sendto_realops_snomask(SNO_DEBUG, L_ALL,
+				     "Invalid prefix (%s) from %s",
+				     lbuffer, client_p->name);
 	else
-		sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)", 
-			   get_id(&me, client_p), lsender, me.name);
+	{
+		memcpy(sid, lsender, 3);
+		sid[3] = '\0';
+		server = find_server(NULL, sid);
+		if (server != NULL && server->from == client_p)
+			sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)", 
+					get_id(&me, client_p), lsender, me.name);
+	}
 }
 
 
@@ -561,7 +574,6 @@ remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 /*
  *
  *      parc    number of arguments ('sender' counted as one!)
- *      parv[0] pointer to 'sender' (may point to empty string) (not used)
  *      parv[1]..parv[parc-1]
  *              pointers to additional parameters, this is a NULL
  *              terminated list (parv[parc] == NULL).