X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fctables.h;h=75795e48ca47c25759c66274db0d58e66564d2e3;hb=8cb1935360087b4e38802b837981e5f41e9b87d7;hp=4cb530e63af892c7b9e598fc5bfb185dcfe276d4;hpb=bbb5f6ee63b4a226e6679119a1ee8c725d7d2abc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/ctables.h b/include/ctables.h
index 4cb530e63..75795e48c 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,9 +20,13 @@ enum CmdResult
 {
 	CMD_FAILURE = 0,	/* Command exists, but failed */
 	CMD_SUCCESS = 1,	/* Command exists, and succeeded */
-	CMD_INVALID = 2		/* Command doesnt exist at all! */
+	CMD_INVALID = 2,	/* Command doesnt exist at all! */
+	CMD_EPERM = 3       /* Command failed because of a permission check */
 };
 
+/** Flag for commands that are only allowed from servers */
+const char FLAG_SERVERONLY = 7; // technically anything nonzero below 'A' works
+
 /** Translation types for translation of parameters to UIDs.
  * This allows the core commands to not have to be aware of how UIDs
  * work (making it still possible to write other linking modules which
@@ -85,16 +89,9 @@ struct RouteDescriptor
 /** A structure that defines a command. Every command available
  * in InspIRCd must be defined as derived from Command.
  */
-class CoreExport Command : public classbase
+class CoreExport Command : public ServiceProvider
 {
  public:
-	/** Command name
-	*/
-	const std::string command;
-
-	/** Creator module - never NULL */
-	ModuleRef creator;
-
 	/** User flags needed to execute the command or 0
 	 */
 	char flags_needed;
@@ -111,11 +108,11 @@ class CoreExport Command : public classbase
 
 	/** used by /stats m
 	 */
-	long double use_count;
+	long use_count;
 
 	/** used by /stats m
 	 */
-	long double total_bytes;
+	long total_bytes;
 
 	/** True if the command is disabled to non-opers
 	 */
@@ -151,7 +148,7 @@ class CoreExport Command : public classbase
 	 * NICK, optionally PASS, and been resolved).
 	 */
 	Command(Module* me, const std::string &cmd, int minpara = 0, int maxpara = 0) :
-		command(cmd), creator(me), flags_needed(0), min_params(minpara), max_params(maxpara),
+		ServiceProvider(me, cmd, SERVICE_COMMAND), flags_needed(0), min_params(minpara), max_params(maxpara),
 		use_count(0), total_bytes(0), disabled(false), works_before_reg(false), Penalty(1)
 	{
 	}
@@ -214,10 +211,6 @@ class CoreExport Command : public classbase
 	virtual ~Command();
 };
 
-class LocalUser;
-class RemoteUser;
-class FakeUser;
-
 class CoreExport SplitCommand : public Command
 {
  public:
@@ -229,10 +222,6 @@ class CoreExport SplitCommand : public Command
 	virtual CmdResult HandleServer(const std::vector<std::string>& parameters, FakeUser* user);
 };
 
-/** A hash of commands used by the core
- */
-typedef nspace::hash_map<std::string,Command*> Commandtable;
-
 /** Shortcut macros for defining translation lists
  */
 #define TRANSLATE1(x1)	translation.push_back(x1);