A LOT updates. Cannot separate. :)

[silc.git] / apps / silcd / command.h

diff --git a/apps/silcd/command.h b/apps/silcd/command.h
index d7ed494402f85815512825d49220991aab85bb6e..1ced0891082df4ea576fa14e50edf7a0a3154f43 100644 (file)
--- a/apps/silcd/command.h
+++ b/apps/silcd/command.h
@@ -52,6 +52,7 @@ typedef struct {
   SilcServer server;
   SilcSocketConnection sock;
   SilcCommandPayload payload;
+  SilcArgumentPayload args;
   SilcPacketContext *packet;
   int pending;
 } *SilcServerCommandContext;
@@ -82,24 +83,6 @@ extern SilcServerCommandPending *silc_command_pending;
 #define SILC_SERVER_CMD_FUNC(func) \
 void silc_server_command_##func(void *context)
 
-/* Macro used to execute commands */
-#define SILC_SERVER_COMMAND_EXEC(ctx)                          \
-do {                                                           \
-  SilcServerCommand *cmd;                                      \
-                                                               \
-  for (cmd = silc_command_list; cmd->cb; cmd++)                        \
-    if (cmd->cmd == silc_command_get(ctx->payload)) {          \
-      cmd->cb(ctx);                                            \
-      break;                                                   \
-    }                                                          \
-                                                               \
-  if (cmd == NULL) {                                           \
-    SILC_LOG_ERROR(("Unknown command, packet dropped"));       \
-    silc_free(ctx);                                            \
-    return;                                                    \
-  }                                                            \
-} while(0)
-
 /* Checks for pending commands */
 #define SILC_SERVER_COMMAND_CHECK_PENDING(ctx)         \
 do {                                                   \
@@ -128,6 +111,9 @@ do {                                                        \
 } while(0)
 
 /* Prototypes */
+void silc_server_command_process(SilcServer server,
+                                SilcSocketConnection sock,
+                                SilcPacketContext *packet);
 void silc_server_command_pending(SilcCommand reply_cmd,
                                 SilcCommandCb callback,
                                 void *context);
@@ -152,6 +138,7 @@ SILC_SERVER_CMD_FUNC(join);
 SILC_SERVER_CMD_FUNC(motd);
 SILC_SERVER_CMD_FUNC(umode);
 SILC_SERVER_CMD_FUNC(cmode);
+SILC_SERVER_CMD_FUNC(cumode);
 SILC_SERVER_CMD_FUNC(kick);
 SILC_SERVER_CMD_FUNC(ignore);
 SILC_SERVER_CMD_FUNC(restart);