X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/4d03595da413968ac32224c50a6e38023040f37a..36f0ec74c10d3bf712f4041c5ed1ad83d405aaa3:/ircd/parse.c

diff --git a/ircd/parse.c b/ircd/parse.c
index 318e1a07..6ec8ba42 100644
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -51,12 +51,12 @@ struct Dictionary *alias_dict = NULL;
 static char *para[MAXPARA + 2];
 
 static void cancel_clients(struct Client *, struct Client *);
-static void remove_unknown(struct Client *, char *, char *);
+static void remove_unknown(struct Client *, const char *, char *);
 
 static void do_numeric(int, struct Client *, struct Client *, int, const char **);
 static void do_alias(struct alias_entry *, struct Client *, char *);
 
-static int handle_command(struct Message *, struct Client *, struct Client *, int, const char**);
+static int handle_command(struct Message *, struct MsgBuf *, struct Client *, struct Client *);
 
 static char buffer[1024];
 
@@ -83,9 +83,6 @@ void
 parse(struct Client *client_p, char *pbuffer, char *bufend)
 {
 	struct Client *from = client_p;
-	char *sender;
-	char *ch;
-	char *s;
 	char *end;
 	int i = 1, res;
 	int numeric = 0;
@@ -120,7 +117,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 		if(from == NULL)
 		{
 			ServerStats.is_unpf++;
-			remove_unknown(client_p, sender, pbuffer);
+			remove_unknown(client_p, msgbuf.origin, pbuffer);
 			return;
 		}
 
@@ -148,17 +145,17 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 		{
 			if (IsPerson(client_p))
 			{
-				struct alias_entry *aptr = irc_dictionary_retrieve(alias_dict, ch);
+				struct alias_entry *aptr = irc_dictionary_retrieve(alias_dict, msgbuf.cmd);
 				if (aptr != NULL)
 				{
-					do_alias(aptr, client_p, s);
+					do_alias(aptr, client_p, reconstruct_parv(msgbuf.n_para - 1, msgbuf.para + 1));
 					return;
 				}
 			}
 			if(IsPerson(from))
 			{
 				sendto_one(from, form_str(ERR_UNKNOWNCOMMAND),
-					   me.name, from->name, ch);
+					   me.name, from->name, msgbuf.cmd);
 			}
 			ServerStats.is_unco++;
 			return;
@@ -173,7 +170,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 		return;
 	}
 
-	if(handle_command(mptr, client_p, from, msgbuf.n_para, /* XXX discards const!!! */ (const char **)(void *) msgbuf.para) < -1)
+	if(handle_command(mptr, &msgbuf, client_p, from) < -1)
 	{
 		char *p;
 		for (p = pbuffer; p <= end; p += 8)
@@ -203,16 +200,14 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
  * handle_command
  *
  * inputs	- pointer to message block
+ * 		- pointer to message buffer
  *		- pointer to client
  *		- pointer to client message is from
- *		- count of number of args
- *		- pointer to argv[] array
  * output	- -1 if error from server
  * side effects	-
  */
 static int
-handle_command(struct Message *mptr, struct Client *client_p,
-	       struct Client *from, int i, const char** hpara)
+handle_command(struct Message *mptr, struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *from)
 {
 	struct MessageEntry ehandler;
 	MessageHandler handler = 0;
@@ -226,25 +221,12 @@ handle_command(struct Message *mptr, struct Client *client_p,
 
 	mptr->count++;
 
-	/* New patch to avoid server flooding from unregistered connects
-	   - Pie-Man 07/27/2000 */
-
-	if(!IsRegistered(client_p))
-	{
-		/* if its from a possible server connection
-		 * ignore it.. more than likely its a header thats sneaked through
-		 */
-
-		if(IsAnyServer(client_p) && !(mptr->flags & MFLG_UNREG))
-			return (1);
-	}
-
 	ehandler = mptr->handlers[from->handler];
 	handler = ehandler.handler;
 
 	/* check right amount of params is passed... --is */
-	if(i < ehandler.min_para ||
-	   (ehandler.min_para && EmptyString(hpara[ehandler.min_para - 1])))
+	if(msgbuf_p->n_para < ehandler.min_para ||
+	   (ehandler.min_para && EmptyString(msgbuf_p->para[ehandler.min_para - 1])))
 	{
 		if(!IsServer(client_p))
 		{
@@ -260,24 +242,24 @@ handle_command(struct Message *mptr, struct Client *client_p,
 
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Dropping server %s due to (invalid) command '%s'"
-				     " with only %d arguments (expecting %d).",
-				     client_p->name, mptr->cmd, i, ehandler.min_para);
+				     " with only %zu arguments (expecting %d).",
+				     client_p->name, mptr->cmd, msgbuf_p->n_para, ehandler.min_para);
 		ilog(L_SERVER,
-		     "Insufficient parameters (%d < %d) for command '%s' from %s.",
-		     i, ehandler.min_para, mptr->cmd, client_p->name);
+		     "Insufficient parameters (%zu < %d) for command '%s' from %s.",
+		     msgbuf_p->n_para, ehandler.min_para, mptr->cmd, client_p->name);
 		snprintf(squitreason, sizeof squitreason,
-				"Insufficient parameters (%d < %d) for command '%s'",
-				i, ehandler.min_para, mptr->cmd);
+				"Insufficient parameters (%zu < %d) for command '%s'",
+				msgbuf_p->n_para, ehandler.min_para, mptr->cmd);
 		exit_client(client_p, client_p, client_p, squitreason);
 		return (-1);
 	}
 
-	(*handler) (client_p, from, i, hpara);
+	(*handler) (msgbuf_p, client_p, from, msgbuf_p->n_para, msgbuf_p->para);
 	return (1);
 }
 
 void
-handle_encap(struct Client *client_p, struct Client *source_p,
+handle_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 	     const char *command, int parc, const char *parv[])
 {
 	struct Message *mptr;
@@ -296,7 +278,7 @@ handle_encap(struct Client *client_p, struct Client *source_p,
 	   (ehandler.min_para && EmptyString(parv[ehandler.min_para - 1])))
 		return;
 
-	(*handler) (client_p, source_p, parc, parv);
+	(*handler) (msgbuf_p, client_p, source_p, parc, parv);
 }
 
 /*
@@ -428,7 +410,7 @@ cancel_clients(struct Client *client_p, struct Client *source_p)
  * side effects	- kills issued for clients, squits for servers
  */
 static void
-remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
+remove_unknown(struct Client *client_p, const char *lsender, char *lbuffer)
 {
 	int slen = strlen(lsender);
 	char sid[4];
@@ -621,14 +603,14 @@ static void do_alias(struct alias_entry *aptr, struct Client *source_p, char *te
 }
 
 int
-m_not_oper(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_not_oper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
 	return 0;
 }
 
 int
-m_unregistered(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_unregistered(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	/* bit of a hack.
 	 * I don't =really= want to waste a bit in a flag
@@ -645,14 +627,14 @@ m_unregistered(struct Client *client_p, struct Client *source_p, int parc, const
 }
 
 int
-m_registered(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_registered(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	sendto_one(client_p, form_str(ERR_ALREADYREGISTRED), me.name, source_p->name);
 	return 0;
 }
 
 int
-m_ignore(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_ignore(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	return 0;
 }