Make server-to-server protocol more robust

[ngircd-alex.git] / src / ngircd / irc-macros.h

diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h
index bd63ec495f7253f8b20dd9a006e794b1158d7626..2abb1614a8effc367bc7216bfcd34b7faece03cc 100644 (file)
--- a/src/ngircd/irc-macros.h
+++ b/src/ngircd/irc-macros.h
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de).
+ * Copyright (c)2001-2015 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
@@ -17,6 +17,18 @@
  * Macros for functions that handle IRC commands.
  */
 
+/**
+ * Make sure that number of passed parameters is equal to Count.
+ *
+ * If there are not exactly Count parameters, send an error to the client and
+ * return from the function.
+ */
+#define _IRC_ARGC_EQ_OR_RETURN_(Client, Req, Count) \
+if (Req->argc != Count) { \
+       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+                                 Client_ID(Client), Req->command); \
+}
+
 /**
  * Make sure that number of passed parameters is less or equal than Max.
  *
@@ -24,9 +36,10 @@
  * return from the function.
  */
 #define _IRC_ARGC_LE_OR_RETURN_(Client, Req, Max) \
-if (Req->argc > Max) \
-       return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-                                 Client_ID(Client), Req->command);
+if (Req->argc > Max) { \
+       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+                                 Client_ID(Client), Req->command); \
+}
 
 /**
  * Make sure that number of passed parameters is greater or equal than Min.
@@ -35,9 +48,34 @@ if (Req->argc > Max) \
  * return from the function.
  */
 #define _IRC_ARGC_GE_OR_RETURN_(Client, Req, Min) \
-if (Req->argc < Min) \
-       return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-                                 Client_ID(Client), Req->command);
+if (Req->argc < Min) { \
+       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+                                 Client_ID(Client), Req->command); \
+}
+
+/**
+ * Make sure that number of passed parameters is in between Min and Max.
+ *
+ * If there aren't at least Min parameters or if there are more than Max
+ * parameters, send an error to the client and return from the function.
+ */
+#define _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, Min, Max) \
+if (Req->argc < Min || Req->argc > Max) { \
+       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+                                 Client_ID(Client), Req->command); \
+}
+
+/**
+ * Make sure that the command has a prefix.
+ *
+ * If there is no prefix, send an error to the client and return from
+ * the function.
+ */
+#define _IRC_REQUIRE_PREFIX_OR_RETURN_(Client, Req) \
+if (!Req->prefix) { \
+       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+                                 Client_ID(Client), Req->command); \
+}
 
 /**
  * Get sender of an IRC command.
@@ -47,13 +85,17 @@ if (Req->argc < Min) \
  * send an error to the client and return from the function.
  */
 #define _IRC_GET_SENDER_OR_RETURN_(Sender, Req, Client) \
-       if (Client_Type(Client) == CLIENT_SERVER) \
+       if (Client_Type(Client) == CLIENT_SERVER) { \
+               if (!Req->prefix) \
+                       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+                                                 Client_ID(Client), Req->command); \
                Sender = Client_Search(Req->prefix); \
-       else \
+       } else \
                Sender = Client; \
        if (!Sender) \
-               return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, \
-                                         Client_ID(Client), Req->prefix);
+               return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG, \
+                                         Client_ID(Client), \
+                                         Req->prefix ? Req->prefix : "(none)");
 
 /**
  * Get target of an IRC command and make sure that it is a server.
@@ -71,7 +113,7 @@ if (Req->argc < Min) \
                if (!Target) \
                        Target = Client_SearchServer(Req->argv[Argc]); \
                if (!Target) \
-                       return IRC_WriteStrClient(From, ERR_NOSUCHSERVER_MSG, \
+                       return IRC_WriteErrClient(From, ERR_NOSUCHSERVER_MSG, \
                                          Client_ID(From), Req->argv[Argc]); \
                if (Client_Type(Target) != CLIENT_SERVER) \
                        Target = Client_Introducer(Target); \