updates.

[silc.git] / lib / silcclient / command.h

diff --git a/lib/silcclient/command.h b/lib/silcclient/command.h
index cf236483e51669995812f32c21537ff07aebd56a..10218167500bb60153b0d53a9834d0601cb307f6 100644 (file)
--- a/lib/silcclient/command.h
+++ b/lib/silcclient/command.h
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 
-  Copyright (C) 1997 - 2000 Pekka Riikonen
+  Copyright (C) 1997 - 2001 Pekka Riikonen
 
   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
@@ -53,31 +53,29 @@ typedef struct {
   SilcCommand cmd;
   char *name;
   SilcCommandFlag flags;
-  unsigned int max_args;
+  uint32 max_args;
 } SilcClientCommand;
 
 /* All client commands */
 extern SilcClientCommand silc_command_list[];
 
-/* Context sent as argument to all commands */
+/* Context sent as argument to all commands. This is used by the library
+   and application should use this as well. However, application may
+   choose to use some own context for its own local command. All library
+   commands, however, must use this context. */
 typedef struct {
   SilcClient client;
   SilcClientConnection conn;
   SilcClientCommand *command;
-  unsigned int argc;
+  uint32 argc;
   unsigned char **argv;
-  unsigned int *argv_lens;
-  unsigned int *argv_types;
+  uint32 *argv_lens;
+  uint32 *argv_types;
   int pending;                 /* Command is being re-processed when TRUE */
   int users;                   /* Reference counter */
 } *SilcClientCommandContext;
 
-/* Pending Command callback destructor. This is called after calling the
-   pending callback or if error occurs while processing the pending command.
-   If error occurs then the callback won't be called at all, and only this
-   destructor is called. The `context' is the context given for the function
-   silc_client_command_pending. */
-typedef void (*SilcClientPendingDestructor)(void *context);
+#include "silcapi.h"
 
 /* Structure holding pending commands. If command is pending it will be
    executed after command reply has been executed. */
@@ -86,7 +84,7 @@ typedef struct SilcClientCommandPendingStruct {
   SilcCommandCb callback;
   SilcClientPendingDestructor destructor;
   void *context;
-  unsigned short ident;
+  uint16 ident;
   struct SilcClientCommandPendingStruct *next;
 } SilcClientCommandPending;
 
@@ -103,13 +101,13 @@ extern SilcClientCommandPending *silc_command_pending;
 
 /* Macro used to declare command functions */
 #define SILC_CLIENT_CMD_FUNC(func) \
-void silc_client_command_##func(void *context)
+void silc_client_command_##func(void *context, void *context2)
 
 /* Executed pending command callback */
 #define SILC_CLIENT_PENDING_EXEC(ctx, cmd)     \
 do {                                           \
   if ((ctx)->callback)                         \
-    (*ctx->callback)(ctx->context);            \
+    (*ctx->callback)(ctx->context, ctx);       \
 } while(0)
 
 /* Execute destructor for pending command */
@@ -121,28 +119,15 @@ do {                                                                      \
     (*ctx->destructor)(ctx->context);                                  \
 } while(0)
 
-/* Prototypes */
-void silc_client_send_command(SilcClient client, SilcClientConnection conn,
-                             SilcCommand command, unsigned short ident,
-                             unsigned int argc, ...);
-SilcClientCommand *silc_client_command_find(const char *name);
-SilcClientCommandContext silc_client_command_alloc();
-void silc_client_command_free(SilcClientCommandContext ctx);
-SilcClientCommandContext 
-silc_client_command_dup(SilcClientCommandContext ctx);
-void silc_client_command_pending(SilcClientConnection conn,
-                                SilcCommand reply_cmd,
-                                unsigned short ident,
-                                SilcClientPendingDestructor destructor,
-                                SilcCommandCb callback,
-                                void *context);
+/* Prototypes (some prototypes are in the silcapi.h file) */
 void silc_client_command_pending_del(SilcClientConnection conn,
                                     SilcCommand reply_cmd,
-                                    unsigned short ident);
+                                    uint16 ident);
 int silc_client_command_pending_check(SilcClientConnection conn,
                                      SilcClientCommandReplyContext ctx,
                                      SilcCommand command, 
-                                     unsigned short ident);
+                                     uint16 ident);
+
 SILC_CLIENT_CMD_FUNC(whois);
 SILC_CLIENT_CMD_FUNC(whowas);
 SILC_CLIENT_CMD_FUNC(identify);
@@ -162,11 +147,12 @@ SILC_CLIENT_CMD_FUNC(umode);
 SILC_CLIENT_CMD_FUNC(cmode);
 SILC_CLIENT_CMD_FUNC(cumode);
 SILC_CLIENT_CMD_FUNC(kick);
-SILC_CLIENT_CMD_FUNC(restart);
+SILC_CLIENT_CMD_FUNC(ban);
 SILC_CLIENT_CMD_FUNC(close);
-SILC_CLIENT_CMD_FUNC(die);
+SILC_CLIENT_CMD_FUNC(shutdown);
 SILC_CLIENT_CMD_FUNC(silcoper);
 SILC_CLIENT_CMD_FUNC(leave);
 SILC_CLIENT_CMD_FUNC(users);
+SILC_CLIENT_CMD_FUNC(getkey);
 
 #endif