X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand_reply.h;h=4eb8ca18ea428b63345f25ae0234cd7d9a8f14af;hp=33c412ca485e9c1dd5fd68e8c0452398095e20b3;hb=413da0f8686910f5e627393157566ae729ca99c4;hpb=6394d86063413bc1c473723f3ef971840195bcd3

diff --git a/lib/silcclient/command_reply.h b/lib/silcclient/command_reply.h
index 33c412ca..4eb8ca18 100644
--- a/lib/silcclient/command_reply.h
+++ b/lib/silcclient/command_reply.h
@@ -1,10 +1,10 @@
 /*
 
-  command_reply.h 
+  command_reply.h
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2001 Pekka Riikonen
+  Copyright (C) 1997 - 2003 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
@@ -26,43 +26,66 @@ typedef struct {
   SilcCommand cmd;
 } SilcClientCommandReply;
 
-/* Context sent as argument to all command reply functions */
+/* Context holding pending command callbacks. */
 typedef struct {
+  SilcCommandCb callback;
+  void *context;
+} *SilcClientCommandPendingCallbacks;
+
+/* Context sent as argument to all command reply functions */
+struct SilcClientCommandReplyContextStruct {
   SilcClient client;
   SilcSocketConnection sock;
   SilcCommandPayload payload;
+  SilcStatus status;
+  SilcStatus error;
   SilcArgumentPayload args;
   SilcPacketContext *packet;
 
   /* If defined this executes the pending command. */
-  SilcClientPendingDestructor destructor;
-  SilcCommandCb callback;
-  void *context;
-  uint16 ident;
-} *SilcClientCommandReplyContext;
+  SilcClientCommandPendingCallbacks callbacks;
+  SilcUInt32 callbacks_count;
+  SilcUInt16 ident;
+  SilcUInt8 users;
+};
 
 /* Macros */
 
+/* Command reply operation that is called at the end of all command replys.
+   Usage: COMMAND_REPLY((ARGS, argument1, argument2, etc...)), */
+#define COMMAND_REPLY(args) cmd->client->internal->ops->command_reply args
+#define SILC_ARGS cmd->client, cmd->sock->user_data,			     \
+             cmd->payload, TRUE, silc_command_get(cmd->payload), cmd->status
+
+/* Error reply to application. Usage: COMMAND_REPLY_ERROR; */
+#define COMMAND_REPLY_ERROR(error)					\
+do {									\
+  if (cmd->status == SILC_STATUS_OK) {					\
+    cmd->client->internal->ops->					\
+      command_reply(cmd->client, cmd->sock->user_data, cmd->payload,	\
+                    FALSE, silc_command_get(cmd->payload), error);	\
+  } else {								\
+    void *arg1 = NULL, *arg2 = NULL;					\
+    silc_status_get_args(cmd->status, cmd->args, &arg1, &arg2);		\
+    cmd->client->internal->ops->					\
+      command_reply(cmd->client, cmd->sock->user_data, cmd->payload,	\
+                    FALSE, silc_command_get(cmd->payload), cmd->status,	\
+	            arg1, arg2);					\
+    silc_free(arg1);							\
+    silc_free(arg2);							\
+  }									\
+} while(0)
+
 /* Macro used to declare command reply functions */
 #define SILC_CLIENT_CMD_REPLY_FUNC(func)				\
 void silc_client_command_reply_##func(void *context, void *context2)
 
-/* Status message structure. Messages are defined below. */
-typedef struct {
-  SilcCommandStatus status;
-  char *message;
-} SilcCommandStatusMessage;
-
-/* Status messages returned by the server */
-#define STAT(x) SILC_STATUS_ERR_##x
-extern const SilcCommandStatusMessage silc_command_status_messages[];
-
 /* Prototypes */
 
 void silc_client_command_reply_process(SilcClient client,
 				       SilcSocketConnection sock,
 				       SilcPacketContext *packet);
-char *silc_client_command_status_message(SilcCommandStatus status);
+void silc_client_command_reply_free(SilcClientCommandReplyContext cmd);
 SILC_CLIENT_CMD_REPLY_FUNC(whois);
 SILC_CLIENT_CMD_REPLY_FUNC(whowas);
 SILC_CLIENT_CMD_REPLY_FUNC(identify);
@@ -72,12 +95,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic);
 SILC_CLIENT_CMD_REPLY_FUNC(invite);
 SILC_CLIENT_CMD_REPLY_FUNC(kill);
 SILC_CLIENT_CMD_REPLY_FUNC(info);
-SILC_CLIENT_CMD_REPLY_FUNC(links);
 SILC_CLIENT_CMD_REPLY_FUNC(stats);
-SILC_CLIENT_CMD_REPLY_FUNC(users);
-SILC_CLIENT_CMD_REPLY_FUNC(connect);
 SILC_CLIENT_CMD_REPLY_FUNC(ping);
-SILC_CLIENT_CMD_REPLY_FUNC(pong);
 SILC_CLIENT_CMD_REPLY_FUNC(oper);
 SILC_CLIENT_CMD_REPLY_FUNC(join);
 SILC_CLIENT_CMD_REPLY_FUNC(motd);
@@ -86,8 +105,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode);
 SILC_CLIENT_CMD_REPLY_FUNC(cumode);
 SILC_CLIENT_CMD_REPLY_FUNC(kick);
 SILC_CLIENT_CMD_REPLY_FUNC(ban);
-SILC_CLIENT_CMD_REPLY_FUNC(close);
-SILC_CLIENT_CMD_REPLY_FUNC(shutdown);
+SILC_CLIENT_CMD_REPLY_FUNC(detach);
+SILC_CLIENT_CMD_REPLY_FUNC(watch);
 SILC_CLIENT_CMD_REPLY_FUNC(silcoper);
 SILC_CLIENT_CMD_REPLY_FUNC(leave);
 SILC_CLIENT_CMD_REPLY_FUNC(users);
@@ -98,5 +117,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(quit);
 SILC_CLIENT_CMD_REPLY_FUNC(whois_i);
 SILC_CLIENT_CMD_REPLY_FUNC(identify_i);
 SILC_CLIENT_CMD_REPLY_FUNC(info_i);
+SILC_CLIENT_CMD_REPLY_FUNC(users_i);
+
+SILC_CLIENT_CMD_REPLY_FUNC(connect);
+SILC_CLIENT_CMD_REPLY_FUNC(close);
+SILC_CLIENT_CMD_REPLY_FUNC(shutdown);
 
 #endif