X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/21c9d815d7293b2fa7e531e8f9f69db2e3399554..ac408af6cba5a230c66186d4389e60766c3a74a4:/src/parse.c

diff --git a/src/parse.c b/src/parse.c
index 36976ce..37d0c88 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 == ':')
@@ -162,7 +161,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 			/* didnt find any matching client, issue a kill */
 			if(from == NULL)
 			{
-				ServerStats->is_unpf++;
+				ServerStats.is_unpf++;
 				remove_unknown(client_p, sender, pbuffer);
 				return;
 			}
@@ -172,7 +171,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 			/* fake direction, hmm. */
 			if(from->from != client_p)
 			{
-				ServerStats->is_wrdi++;
+				ServerStats.is_wrdi++;
 				cancel_clients(client_p, from, pbuffer);
 				return;
 			}
@@ -183,7 +182,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 
 	if(*ch == '\0')
 	{
-		ServerStats->is_empt++;
+		ServerStats.is_empt++;
 		return;
 	}
 
@@ -204,7 +203,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 	{
 		mptr = NULL;
 		numeric = ch;
-		ServerStats->is_num++;
+		ServerStats.is_num++;
 		s = ch + 3;	/* I know this is ' ' from above if */
 		*s++ = '\0';	/* blow away the ' ', and point s to next part */
 	}
@@ -248,7 +247,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 						   me.name, from->name, ch);
 				}
 			}
-			ServerStats->is_unco++;
+			ServerStats.is_unco++;
 			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);
 	}
 }
 
@@ -534,7 +533,7 @@ remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 {
 	int slen = strlen(lsender);
 
-	/* 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,14 +543,14 @@ 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
+	else if(IsDigit(lsender[0]))
 		sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)", 
 			   get_id(&me, client_p), lsender, me.name);
 }
@@ -561,7 +560,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).