X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fparse.c;h=58205256fe590c6362cc0db5c2e175a58675780a;hp=4235497b35e43d34aedc8f04a93c8df8237c2af4;hb=b8482fd3cfdb429aec75575958f4d5d4e9ae22df;hpb=fcf61e9e0264d081e72eedddbd4a45b619e82b01

diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c
index 4235497b..58205256 100644
--- a/src/ngircd/parse.c
+++ b/src/ngircd/parse.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,29 +16,26 @@
  * IRC command parser and validator.
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <strings.h>
 
 #include "ngircd.h"
-#include "defines.h"
 #include "conn-func.h"
+#include "conf.h"
 #include "channel.h"
 #include "log.h"
 #include "messages.h"
-#include "tool.h"
 
-#include "exp.h"
 #include "parse.h"
 
-#include "imp.h"
 #include "irc.h"
 #include "irc-cap.h"
 #include "irc-channel.h"
-#include "irc-encoding.h"
+#ifdef ICONV
+# include "irc-encoding.h"
+#endif
 #include "irc-info.h"
 #include "irc-login.h"
 #include "irc-metadata.h"
@@ -49,9 +46,6 @@
 #include "irc-write.h"
 #include "numeric.h"
 
-#include "exp.h"
-#include "conf.h"
-
 struct _NUMERIC {
 	int numeric;
 	bool (*function) PARAMS(( CLIENT *Client, REQUEST *Request ));
@@ -76,7 +70,7 @@ static COMMAND My_Commands[] =
 	_CMD("GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
 	_CMD("HELP", IRC_HELP, CLIENT_USER, 0, 1, 2),
 	_CMD("INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 1, 2),
-	_CMD("INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2, 0),
+	_CMD("INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2, 1),
 	_CMD("ISON", IRC_ISON, CLIENT_USER, 1, -1, 0),
 	_CMD("JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 1, 2, 0),
 	_CMD("KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 2, 3, 0),
@@ -86,7 +80,7 @@ static COMMAND My_Commands[] =
 	_CMD("LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 2, 2),
 	_CMD("LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 2, 1),
 	_CMD("METADATA", IRC_METADATA, CLIENT_SERVER, 3, 3, 0),
-	_CMD("MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1, 0),
+	_CMD("MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1, 1),
 	_CMD("MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 1, 3),
 	_CMD("NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 2, 1),
 	_CMD("NICK", IRC_NICK, CLIENT_ANY, 0, -1, 0),
@@ -119,7 +113,7 @@ static COMMAND My_Commands[] =
 	_CMD("WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 1, 1, 0),
 	_CMD("WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 4, 4, 0),
 	_CMD("WHO", IRC_WHO, CLIENT_USER, 0, 2, 1),
-	_CMD("WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
+	_CMD("WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1, 1),
 	_CMD("WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
 
 #ifdef IRCPLUS
@@ -348,7 +342,7 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed )
 	/* check if the client named in the prefix is expected
 	 * to come from that direction */
 	if (Client_NextHop(c) != client) {
-		if (Client_Type(c) != CLIENT_SERVER) {
+		if (Client_Type(client) != CLIENT_SERVER) {
 			Log(LOG_ERR,
 			    "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\"), closing connection!",
 			    Req->prefix, Client_ID(client), Idx, Req->command);
@@ -533,14 +527,14 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
 						Client_ID(client));
 		}
 
+		if (cmd->penalty)
+			IRC_SetPenalty(client, cmd->penalty);
+
 		if (Req->argc < cmd->min_argc ||
 		    (cmd->max_argc != -1 && Req->argc > cmd->max_argc))
 			return IRC_WriteErrClient(client, ERR_NEEDMOREPARAMS_MSG,
 						  Client_ID(client), Req->command);
 
-		if (cmd->penalty)
-			IRC_SetPenalty(client, cmd->penalty);
-
 		/* Command is allowed for this client: call it and count
 		 * generated bytes in output */
 		Conn_ResetWCounter();